Nick Townsend 08d4d90ac6 Merge remote-tracking branch 'upstream/master' into scm_subtree ... Conflicts: CHANGELOG.md		2014-11-17 10:30:49 -08:00
..
integration	Treat all host/role filtering options the same	2014-09-25 18:04:49 -07:00
lib	Merge remote-tracking branch 'upstream/master' into scm_subtree	2014-11-17 10:30:49 -08:00
support	Use a more idiomatic apt-get install method	2014-11-17 13:47:24 +01:00
integration_spec_helper.rb	Add integration tests for deploy task	2013-06-16 13:08:15 +01:00
spec_helper.rb	move to rspec 3	2014-08-12 22:52:37 +04:00