Merge and close #476
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/d9295ce1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d9295ce1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d9295ce1 Branch: refs/heads/master Commit: d9295ce1871d512d696c45eb4a3f68ab9733de92 Parents: 5145412 6c9dc76 Author: Richard Downer <[email protected]> Authored: Fri Jan 30 16:04:03 2015 +0000 Committer: Richard Downer <[email protected]> Committed: Fri Jan 30 16:04:03 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(-) ----------------------------------------------------------------------
