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 | |
| parent | 83ac3e789ddc8dbf40c93460032474870fb16c54 (diff) | |
| parent | 4c9eca1cab3caae8050807fc71b24408fce85e69 (diff) | |
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')
| -rw-r--r-- | lib/puppet/resource/status.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/puppet/resource/status.rb b/lib/puppet/resource/status.rb index ee83004bb..a9a64425e 100644 --- a/lib/puppet/resource/status.rb +++ b/lib/puppet/resource/status.rb @@ -12,7 +12,7 @@ module Puppet attr_reader :source_description, :default_log_level, :time, :resource attr_reader :change_count, :out_of_sync_count, :resource_type, :title - YAML_ATTRIBUTES = %w{@resource @file @line @evaluation_time @change_count @out_of_sync_count @tags @time @events @out_of_sync @changed @resource_type @title} + YAML_ATTRIBUTES = %w{@resource @file @line @evaluation_time @change_count @out_of_sync_count @tags @time @events @out_of_sync @changed @resource_type @title @skipped} # Provide a boolean method for each of the states. STATES.each do |attr| @@ -51,6 +51,7 @@ module Puppet @out_of_sync_count = 0 @changed = false @out_of_sync = false + @skipped = false [:file, :line].each do |attr| send(attr.to_s + "=", resource.send(attr)) |