diff options
| author | Jacob Helwig <jacob@puppetlabs.com> | 2011-03-02 16:10:40 -0800 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-03-02 16:10:40 -0800 |
| commit | 63d8a1f83f4ad109817990354f05879f44419137 (patch) | |
| tree | 41a57a60847bef40e3e28f77faa2dea51f2f05a7 | |
| parent | 9571c99b6c8a1244e0cdda416a2e9ca0c52b25cb (diff) | |
| parent | d24e32a19648d7a97c329fc3a5c4277f05cc5b04 (diff) | |
| download | puppet-63d8a1f83f4ad109817990354f05879f44419137.tar.gz puppet-63d8a1f83f4ad109817990354f05879f44419137.tar.xz puppet-63d8a1f83f4ad109817990354f05879f44419137.zip | |
Merge branch '2.6.x' into 2.6.next
* 2.6.x:
Update CHANGELOG and version for 2.6.6rc1
(#6541) Fix content with checksum truncation bug
(#6418) Recursive files shouldn't be audited
| -rw-r--r-- | CHANGELOG | 5 | ||||
| -rw-r--r-- | lib/puppet.rb | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2.6.6rc1 +======== +7c2a980 (#6541) Fix content with checksum truncation bug +63e911f (#6418) Recursive files shouldn't be audited + 2.6.5 ===== 30fa41d Updated CHANGELOG for 2.6.5rc5 diff --git a/lib/puppet.rb b/lib/puppet.rb index 5c3e7f18b..b13e06b9d 100644 --- a/lib/puppet.rb +++ b/lib/puppet.rb @@ -24,7 +24,7 @@ require 'puppet/util/run_mode' # it's also a place to find top-level commands like 'debug' module Puppet - PUPPETVERSION = '2.6.5' + PUPPETVERSION = '2.6.6' def Puppet.version PUPPETVERSION |