Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-brooklyn
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/4a568251 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/4a568251 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/4a568251 Branch: refs/heads/master Commit: 4a5682511fabe40e7e2756d33b8563eabef141f6 Parents: 8695077 d9295ce Author: Alex Heneveld <[email protected]> Authored: Fri Jan 30 18:11:10 2015 +0000 Committer: Alex Heneveld <[email protected]> Committed: Fri Jan 30 18:11:10 2015 +0000 ---------------------------------------------------------------------- .../location/basic/SshMachineLocation.java | 24 +++++++++++-- .../SshMachineLocationIntegrationTest.java | 38 +++++++++++++++++++- .../ssh/SshToolAbstractIntegrationTest.java | 13 +++++++ .../location/jclouds/JcloudsLocation.java | 1 + 4 files changed, 73 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
