summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Stahnke <stahnma@puppetlabs.com>2011-07-29 14:22:18 -0700
committerMichael Stahnke <stahnma@puppetlabs.com>2011-07-29 14:22:18 -0700
commit1e826bfe371de67372548b5973614946c39f4d78 (patch)
tree542a92d023ebaf007bcdc437b014f763286a7f87
parent6cb35727272d62514d6b82b8525b4c44701f6ef6 (diff)
parent1e76c166d91fd125ca5d25d7dc6a0ce7af4c8e1f (diff)
downloadpuppet-1e826bfe371de67372548b5973614946c39f4d78.tar.gz
puppet-1e826bfe371de67372548b5973614946c39f4d78.tar.xz
puppet-1e826bfe371de67372548b5973614946c39f4d78.zip
Merge branch '2.7rc' into 2.7.x
-rw-r--r--CHANGELOG4
1 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index de4c5addd..cfdcf4932 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+2.7.2rc3
+===
+Fix cross branch confusion on 2.7.2rc2
+
2.7.2rc2
===
8ec0804 (#8301) Red Hat spec file for 2.7.2rc1 won't work