Merge remote-tracking branch 'apache-gh/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/3c11304c Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3c11304c Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3c11304c Branch: refs/heads/master Commit: 3c11304c9429160f7dde04b53aca789f029f0a5c Parents: 772ec02 d2beaa7 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 +++++-------- .../AbstractWebAppFixtureIntegrationTest.java | 15 +-- ...Boss7ServerNonInheritingIntegrationTest.java | 40 +++---- usage/jsgui/src/main/webapp/assets/css/base.css | 5 + .../webapp/assets/js/util/brooklyn-utils.js | 26 +++++ .../assets/js/view/application-add-wizard.js | 4 +- .../main/webapp/assets/js/view/entity-config.js | 33 +++--- .../webapp/assets/js/view/entity-sensors.js | 33 +++--- .../webapp/assets/tpl/apps/config-name.html | 12 ++- .../webapp/assets/tpl/apps/sensor-name.html | 12 ++- .../brooklyn/util/ssh/IptablesCommands.java | 57 ++++++++++ .../util/ssh/IptablesCommandsFirewalldTest.java | 104 +++++++++++++++++++ 18 files changed, 392 insertions(+), 119 deletions(-) ----------------------------------------------------------------------
