Merge remote-tracking branch 'apache-gh/master'
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d7b73dfb Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d7b73dfb Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d7b73dfb Branch: refs/heads/0.7.0-incubating Commit: d7b73dfb2ccbce81508f546f359b093389736a16 Parents: 8f31efa 2f5f552 Author: Alex Heneveld <[email protected]> Authored: Wed Jun 24 00:36:47 2015 -0700 Committer: Alex Heneveld <[email protected]> Committed: Wed Jun 24 00:36:47 2015 -0700 ---------------------------------------------------------------------- .../brooklyn/entity/basic/AbstractEntity.java | 14 ++- .../event/feed/function/FunctionFeedTest.java | 33 ++++++ .../location/jclouds/JcloudsLocation.java | 29 +++++- .../ha/ConnectionFailureDetectorTest.java | 2 +- .../java/brooklyn/entity/java/JmxSupport.java | 3 +- .../BrooklynNodeIntegrationTest.java | 19 +++- ...SoftwareProcessSshDriverIntegrationTest.java | 70 +++++-------- .../brooklyn/util/ssh/IptablesCommands.java | 57 ++++++++++ .../util/ssh/IptablesCommandsFirewalldTest.java | 104 +++++++++++++++++++ 9 files changed, 277 insertions(+), 54 deletions(-) ----------------------------------------------------------------------
