summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Lewis <nick@puppetlabs.com>2011-01-14 11:01:00 -0800
committerNick Lewis <nick@puppetlabs.com>2011-01-14 11:01:00 -0800
commit41090d3617d99f9eaa58df32be93f3d16467bc50 (patch)
tree5aebb6b13563c1601200bca0c758b4b361da339e
parentadce308f9892887cc8c8a1c2b3af53e7cd034d51 (diff)
parentf9bfb968fac70eca9fe29bbd8afbcabfa1c27b9e (diff)
downloadpuppet-41090d3617d99f9eaa58df32be93f3d16467bc50.tar.gz
puppet-41090d3617d99f9eaa58df32be93f3d16467bc50.tar.xz
puppet-41090d3617d99f9eaa58df32be93f3d16467bc50.zip
Merge branch 'ticket/2.6.next/5900' into 2.6.next
-rw-r--r--lib/puppet/resource/status.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/puppet/resource/status.rb b/lib/puppet/resource/status.rb
index a9a64425e..dea8c105d 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 @skipped}
+ 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 @failed}
# Provide a boolean method for each of the states.
STATES.each do |attr|
@@ -52,6 +52,7 @@ module Puppet
@changed = false
@out_of_sync = false
@skipped = false
+ @failed = false
[:file, :line].each do |attr|
send(attr.to_s + "=", resource.send(attr))