summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2011-12-30 12:19:50 -0800
committerJeff McCune <jeff@puppetlabs.com>2011-12-30 12:19:50 -0800
commit3b9feb8a959d1655780a5e74f953f33d6b3d5b50 (patch)
tree1b7ffa3ca344b0a0ccb10b57fbade7effffc3fb4
parentbf1ed4613320c50fe4f1b6ad5cfd968d17dfe2ea (diff)
parented0de46a2a0661a2457e5fed43a5c76f77414704 (diff)
Merge branch '2.2.x'
* 2.2.x: Update Modulefile CHANGELOG for v2.1.2 release
-rw-r--r--CHANGELOG3
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index dff036b..96ff08c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+2011-12-30 Puppet Labs <support@puppetlabs.com> - 2.1.2
+* Documentation only release for PE 2.0.x
+
2011-11-08 Puppet Labs <support@puppetlabs.com> - 2.2.0
* #10285 - Refactor json to use pson instead.
* Maint - Add watchr autotest script