diff options
| author | Jacob Helwig <jacob@puppetlabs.com> | 2011-03-24 15:46:40 -0700 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-03-24 15:46:40 -0700 |
| commit | 99201ff662e8d2b5e16815843df22cbcad3e2ec2 (patch) | |
| tree | e0b27177b05f47095d89994f854d8690b30bfde8 | |
| parent | 9f1a01653f97c55cb4be8ab560a726a130042b35 (diff) | |
| parent | 76b3ee6822f52b100c45cd8921f13739f12ddf38 (diff) | |
| download | puppet-99201ff662e8d2b5e16815843df22cbcad3e2ec2.tar.gz puppet-99201ff662e8d2b5e16815843df22cbcad3e2ec2.tar.xz puppet-99201ff662e8d2b5e16815843df22cbcad3e2ec2.zip | |
Merge branch '2.6.x' into 2.6.next
* 2.6.x:
Update CHANGELOG for 2.6.7
| -rw-r--r-- | CHANGELOG | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,5 +1,6 @@ -2.6.7rc1 -======== +2.6.7 +===== +17f673d Updated CHANGELOG for 2.6.7rc1 852fb97 (#5073) Download plugins even if you're filtering on tags 4f34dbf Fix #5610: Prevent unnecessary RAL lookups 9781032 Revert "Merge branch 'ticket/2.6.x/5605' of git://github.com/stschulte/puppet into 2.6.next" |