Luke Kanies 29f5f1b862 Merge branch '0.24.x' ... Conflicts: CHANGELOG lib/puppet/transaction.rb		2008-05-25 16:00:48 -05:00
..
integration	Merge branch '0.24.x'	2008-05-20 10:19:10 -05:00
monkey_patches	'rake' within the spec dir works now, anyway, which is	2008-02-12 22:47:40 -06:00
shared_behaviours	Using the new Cacher class for handling cached data.	2008-05-13 16:00:58 -05:00
unit	Merge branch '0.24.x'	2008-05-25 16:00:48 -05:00
Rakefile	Fixing the Rakefile so all tests run in one task instead	2008-02-12 22:53:19 -06:00
spec.opts	the indirector will not serve xmlrpc (this is the responsibility of the legacy networking code; it was a mistake to include stubbed support for it in the new code); removing	2008-04-11 13:10:33 -05:00
spec_helper.rb	'rake' within the spec dir works now, anyway, which is	2008-02-12 22:47:40 -06:00