Merge branch '0.24.x'

Conflicts:

	lib/puppet/util/settings.rb
	spec/integration/defaults.rb
	spec/unit/node/catalog.rb
	spec/unit/type/interface.rb
	spec/unit/type/ssh_authorized_key.rb

1 files changed, 2 insertions, 2 deletions

diff --git a/spec/unit/other/pgraph.rb b/spec/unit/other/pgraph.rb
index 10ab934a6..cad0832a5 100755
--- a/spec/unit/other/pgraph.rb
+++ b/spec/unit/other/pgraph.rb
@@ -47,8 +47,8 @@ end
 describe Puppet::PGraph, " when matching edges" do
     before do
         @graph = Puppet::PGraph.new
-	    @event = Puppet::Event.new(:source => "a", :event => :yay)
-	    @none = Puppet::Event.new(:source => "a", :event => :NONE)
+	    @event = Puppet::Transaction::Event.new(:yay, "a")
+	    @none = Puppet::Transaction::Event.new(:NONE, "a")
 
 	    @edges = {}
 	    @edges["a/b"] = Puppet::Relationship.new("a", "b", {:event => :yay, :callback => :refresh})