Merge branch '0.24.x'

Conflicts:
	bin/ralsh
	lib/puppet/executables/client/certhandler.rb
	lib/puppet/parser/functions/versioncmp.rb
	lib/puppet/parser/resource/reference.rb
	lib/puppet/provider/augeas/augeas.rb
	lib/puppet/provider/nameservice/directoryservice.rb
	lib/puppet/provider/ssh_authorized_key/parsed.rb
	lib/puppet/type.rb
	lib/puppet/type/file/checksum.rb
	spec/integration/defaults.rb
	spec/integration/transaction/report.rb
	spec/unit/executables/client/certhandler.rb
	spec/unit/indirector/ssl_rsa/file.rb
	spec/unit/node/catalog.rb
	spec/unit/provider/augeas/augeas.rb
	spec/unit/rails.rb
	spec/unit/type/ssh_authorized_key.rb
	spec/unit/type/tidy.rb
	test/executables/filebucket.rb
	test/executables/puppetbin.rb

1 files changed, 4 insertions, 4 deletions

diff --git a/spec/unit/other/transbucket.rb b/spec/unit/other/transbucket.rb
index 63de962e5..63b5137b5 100755
--- a/spec/unit/other/transbucket.rb
+++ b/spec/unit/other/transbucket.rb
@@ -70,20 +70,20 @@ describe Puppet::TransBucket, " when generating a catalog" do
         @bottom = Puppet::TransBucket.new
         @bottom.type = "fake"
         @bottom.name = "bottom"
-        @bottomobj = Puppet::TransObject.new("bottom", "user")
+        @bottomobj = Puppet::TransObject.new("bottom", "notify")
         @bottom.push @bottomobj
 
         @middle = Puppet::TransBucket.new
         @middle.type = "fake"
         @middle.name = "middle"
-        @middleobj = Puppet::TransObject.new("middle", "user")
+        @middleobj = Puppet::TransObject.new("middle", "notify")
         @middle.push(@middleobj)
         @middle.push(@bottom)
 
         @top = Puppet::TransBucket.new
         @top.type = "fake"
         @top.name = "top"
-        @topobj = Puppet::TransObject.new("top", "user")
+        @topobj = Puppet::TransObject.new("top", "notify")
         @top.push(@topobj)
         @top.push(@middle)
 
@@ -94,7 +94,7 @@ describe Puppet::TransBucket, " when generating a catalog" do
     it "should convert all transportable objects to RAL resources" do
         @catalog = @top.to_catalog
         @users.each do |name|
-            @catalog.vertices.find { |r| r.class.name == :user and r.title == name }.should be_instance_of(Puppet::Type.type(:user))
+            @catalog.vertices.find { |r| r.class.name == :notify and r.title == name }.should be_instance_of(Puppet::Type.type(:notify))
         end
     end