Merge and close #706
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/5a699652 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/5a699652 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/5a699652 Branch: refs/heads/master Commit: 5a699652334bc5a2f4c73b0b9a8080c8d593721f Parents: fb938ac f466be0 Author: Richard Downer <[email protected]> Authored: Tue Jun 23 13:24:25 2015 +0100 Committer: Richard Downer <[email protected]> Committed: Tue Jun 23 13:24:25 2015 +0100 ---------------------------------------------------------------------- .../ha/ConnectionFailureDetectorTest.java | 2 +- .../java/brooklyn/entity/java/JmxSupport.java | 3 +- .../BrooklynNodeIntegrationTest.java | 19 +++++- ...SoftwareProcessSshDriverIntegrationTest.java | 70 ++++++++------------ .../AbstractWebAppFixtureIntegrationTest.java | 15 +++-- ...Boss7ServerNonInheritingIntegrationTest.java | 40 ++++++----- 6 files changed, 76 insertions(+), 73 deletions(-) ----------------------------------------------------------------------
