diff options
| author | Jacob Helwig <jacob@puppetlabs.com> | 2011-02-14 14:04:43 -0800 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-02-14 14:04:43 -0800 |
| commit | 9b7b0f3ad87abc3a6fbb7ad128e942571cd3e71a (patch) | |
| tree | 44bbfc40ad3cf782c9b36fabbd6db4c405a267e4 /lib/puppet/util/rdoc/code_objects.rb | |
| parent | c1dab76032c2bc6ef374ca1aa5f9cb49b76c7326 (diff) | |
| parent | 9e0f9c5cfecf4ff81724c048c5afe5a288fcc9b2 (diff) | |
| download | puppet-9b7b0f3ad87abc3a6fbb7ad128e942571cd3e71a.tar.gz puppet-9b7b0f3ad87abc3a6fbb7ad128e942571cd3e71a.tar.xz puppet-9b7b0f3ad87abc3a6fbb7ad128e942571cd3e71a.zip | |
Merge branch '2.6.x' into 2.6.next
* 2.6.x:
Updated CHANGELOG for 2.6.5rc4
(#3646) Fix the documentation fix for `puppet apply --apply`
Diffstat (limited to 'lib/puppet/util/rdoc/code_objects.rb')
0 files changed, 0 insertions, 0 deletions