Merge branch '0.24.x'

Conflicts:
	CHANGELOG
	spec/unit/type/file/selinux.rb

1 files changed, 0 insertions, 33 deletions

diff --git a/spec/unit/other/transaction.rb b/spec/unit/other/transaction.rb
deleted file mode 100755
index d2ac26869..000000000
--- a/spec/unit/other/transaction.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../spec_helper'
-
-require 'puppet/transaction'
-
-describe Puppet::Transaction, " when determining tags" do
-    before do
-        @config = Puppet::Resource::Catalog.new
-        @transaction = Puppet::Transaction.new(@config)
-    end
-
-    it "should default to the tags specified in the :tags setting" do
-        Puppet.expects(:[]).with(:tags).returns("one")
-        @transaction.tags.should == %w{one}
-    end
-
-    it "should split tags based on ','" do
-        Puppet.expects(:[]).with(:tags).returns("one,two")
-        @transaction.tags.should == %w{one two}
-    end
-
-    it "should use any tags set after creation" do
-        Puppet.expects(:[]).with(:tags).never
-        @transaction.tags = %w{one two}
-        @transaction.tags.should == %w{one two}
-    end
-
-    it "should always convert assigned tags to an array" do
-        @transaction.tags = "one::two"
-        @transaction.tags.should == %w{one::two}
-    end
-end