diff options
| author | Paul Berry <paul@puppetlabs.com> | 2011-01-06 10:57:43 -0800 |
|---|---|---|
| committer | Paul Berry <paul@puppetlabs.com> | 2011-01-06 10:57:43 -0800 |
| commit | f0a34aaac713f7eb9f39195a7b96eec75322f568 (patch) | |
| tree | d879e04f9985f754d6f27efb2a7e2ae4e028ebc9 /lib/puppet/util/rdoc/code_objects.rb | |
| parent | 83ac3e789ddc8dbf40c93460032474870fb16c54 (diff) | |
| parent | 4c9eca1cab3caae8050807fc71b24408fce85e69 (diff) | |
| download | puppet-f0a34aaac713f7eb9f39195a7b96eec75322f568.tar.gz puppet-f0a34aaac713f7eb9f39195a7b96eec75322f568.tar.xz puppet-f0a34aaac713f7eb9f39195a7b96eec75322f568.zip | |
Merge branch 'maint/2.6.next/add_skipped_to_resource_status' into 2.6.next
* maint/2.6.next/add_skipped_to_resource_status:
Maint: Added "skipped" to the YAML output for Puppet::Resource::Status
Diffstat (limited to 'lib/puppet/util/rdoc/code_objects.rb')
0 files changed, 0 insertions, 0 deletions