summaryrefslogtreecommitdiffstats
path: root/CHANGELOG
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2010-07-12 15:56:54 +1000
committerJames Turnbull <james@lovedthanlost.net>2010-07-12 15:56:54 +1000
commit8747479d59fa211f41186c1ab68987bb4af55f0b (patch)
tree68704683622dda1079c452871c640e30a81fe892 /CHANGELOG
parentfa740203ba7af7e797d082657f77ba1b11be6cd8 (diff)
downloadpuppet-8747479d59fa211f41186c1ab68987bb4af55f0b.tar.gz
puppet-8747479d59fa211f41186c1ab68987bb4af55f0b.tar.xz
puppet-8747479d59fa211f41186c1ab68987bb4af55f0b.zip
Updated CHANGELOG for 2.6.0rc2
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG10
1 files changed, 10 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 22311ca79..527a949e2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,15 @@
+2.6.0rc2
+========
+fa74020 [#4209] catalog.resources should return resources
+f5f9a38 Fix for #4210 -- missing require in CA
+1c3e844 Minimal fix for #4205 -- incorrect Import loop messages
+99d8323 Fix #4206 - import "path/*" tries to import files twice
+a2115af Alt fix for #4207 -- serialize environments as their names
+fe4dcd8 [#4208] Missing parameter breaks multithread compilation
+
2.6.0rc1
========
+e028310 Updated CHANGELOG for 2.6.0rc1
3180b9d Code smell: Two space indentation
5432259 Code smell: Avoid needless decorations
8f15707 Code smell: Don't restate results directly after assignment