diff options
| author | Jacob Helwig <jacob@puppetlabs.com> | 2011-02-21 14:41:12 -0800 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-02-21 14:41:12 -0800 |
| commit | 983c2420d47c83922a4417ec2b85af0740468029 (patch) | |
| tree | 1c96e6b743a4618d8016677ae1417a5091f0d26c /lib/puppet/util/rdoc/code_objects.rb | |
| parent | 7e611714c56e3e28ff2077a024498acd26da0604 (diff) | |
| parent | 30fa41ddc3796e62a5bd1d0cf5116e14323992a3 (diff) | |
| download | puppet-983c2420d47c83922a4417ec2b85af0740468029.tar.gz puppet-983c2420d47c83922a4417ec2b85af0740468029.tar.xz puppet-983c2420d47c83922a4417ec2b85af0740468029.zip | |
Merge branch '2.6.x' into 2.6.next
* 2.6.x:
Updated CHANGELOG for 2.6.5rc5
(#6337) Fix Ruby warning on 1.8.6 about "future compatibility"
(#6353) Restore the ability to store paths in the filebucket
(#6126) Puppet inspect now reports status after run completes.
Diffstat (limited to 'lib/puppet/util/rdoc/code_objects.rb')
0 files changed, 0 insertions, 0 deletions