diff options
author | Matt Robinson <matt@puppetlabs.com> | 2011-02-14 11:02:44 -0800 |
---|---|---|
committer | Matt Robinson <matt@puppetlabs.com> | 2011-02-14 11:02:44 -0800 |
commit | e1b7db490212b1bdf281cfbb3fa5b7e467995753 (patch) | |
tree | e13fe264ee0cb2f4e5fdc8dbafae3f3773d17d5e /lib/puppet/util/rdoc/code_objects.rb | |
parent | 9bd15b77d4cc210249228ff628b6e7708124aca3 (diff) | |
parent | 193016dd152ff17ba94867897656ddca41621b3e (diff) | |
download | puppet-e1b7db490212b1bdf281cfbb3fa5b7e467995753.tar.gz puppet-e1b7db490212b1bdf281cfbb3fa5b7e467995753.tar.xz puppet-e1b7db490212b1bdf281cfbb3fa5b7e467995753.zip |
Merge branch '2.6.x' into 2.6.next
* 2.6.x:
(#5977) fix spec test failure when new applications are introduced.
Diffstat (limited to 'lib/puppet/util/rdoc/code_objects.rb')
0 files changed, 0 insertions, 0 deletions