Merge branch '0.24.x' Removed the 'after' blocks that call Type.clear,

since that method is deprecated.

Conflicts:

	CHANGELOG
	bin/puppetca
	lib/puppet/file_serving/fileset.rb
	lib/puppet/network/xmlrpc/client.rb
	lib/puppet/type/file/selcontext.rb
	spec/unit/file_serving/metadata.rb
	spec/unit/type/file.rb

2 files changed, 2 insertions, 2 deletions

diff --git a/test/lib/puppettest/reporttesting.rb b/test/lib/puppettest/reporttesting.rb
index 9b1764cf6..4d88c3cfc 100644
--- a/test/lib/puppettest/reporttesting.rb
+++ b/test/lib/puppettest/reporttesting.rb
@@ -6,8 +6,6 @@ module PuppetTest::Reporttesting
         3.times { |i|
             # We have to use warning so that the logs always happen
             log = Puppet.warning("Report test message %s" % i)
-            log.tags = %w{a list of tags}
-            log.tags << "tag%s" % i
 
             report.newlog(log)
         }
diff --git a/test/lib/puppettest/runnable_test.rb b/test/lib/puppettest/runnable_test.rb
index e3cde5052..6dab1b743 100644
--- a/test/lib/puppettest/runnable_test.rb
+++ b/test/lib/puppettest/runnable_test.rb
@@ -12,6 +12,8 @@ module PuppetTest
             end
         end
 
+        attr_reader :messages
+
         # Evaluate all of our tests to see if any of them are false
         # and thus whether this test is considered not runnable.
         def runnable?