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 /lib/puppet/util/rdoc/code_objects.rb | |
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
Diffstat (limited to 'lib/puppet/util/rdoc/code_objects.rb')
0 files changed, 0 insertions, 0 deletions