This closes #1013
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/443ed5e8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/443ed5e8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/443ed5e8 Branch: refs/heads/master Commit: 443ed5e8df6ece0692717912778063db64492b41 Parents: 78df97a 6860e04 Author: Aled Sage <[email protected]> Authored: Thu Nov 12 13:45:47 2015 +0000 Committer: Aled Sage <[email protected]> Committed: Thu Nov 12 13:45:47 2015 +0000 ---------------------------------------------------------------------- .../apache/brooklyn/core/config/ConfigKeys.java | 8 ++ .../core/entity/BrooklynConfigKeys.java | 12 ++- .../LocalhostMachineProvisioningLocation.java | 4 + .../location/ssh/SshMachineLocation.java | 83 +++++++++------ .../util/core/internal/ssh/SshTool.java | 14 ++- .../brooklyn/core/config/ConfigKeysTest.java | 21 +++- .../SshMachineLocationReuseIntegrationTest.java | 11 +- .../ssh/SshMachineLocationSshToolTest.java | 96 +++++++++++++++++ .../location/ssh/SshMachineLocationTest.java | 27 ++--- .../brooklyn/entity/java/JavaOptsTest.java | 17 ++- .../entity/software/base/EntitySshToolTest.java | 103 +++++++++++++++++++ .../base/lifecycle/StartStopSshDriverTest.java | 2 + .../nginx/NginxRebindWithHaIntegrationTest.java | 9 +- 13 files changed, 339 insertions(+), 68 deletions(-) ----------------------------------------------------------------------
