Merge branch 'trunk' into branch-feature-AMBARI-18456
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3bbe75c3 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3bbe75c3 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3bbe75c3 Branch: refs/heads/branch-feature-AMBARI-18456 Commit: 3bbe75c3bd7b1a913905137465c19b2c7f7c9ba9 Parents: a58c39c 3096c79 Author: Jonathan Hurley <jhur...@hortonworks.com> Authored: Fri Dec 2 22:40:18 2016 -0500 Committer: Jonathan Hurley <jhur...@hortonworks.com> Committed: Fri Dec 2 22:40:18 2016 -0500 ---------------------------------------------------------------------- ambari-agent/conf/unix/ambari-agent.ini | 3 + .../ambari_agent/CustomServiceOrchestrator.py | 120 +++++++++++++++++++ ambari-agent/src/packages/tarball/all.xml | 30 +++++ .../ambari/server/agent/ExecutionCommand.java | 28 +++++ .../ambari/server/agent/HeartBeatHandler.java | 2 +- .../AmbariManagementControllerImpl.java | 5 + .../configuration/logsearch-properties.xml | 2 +- .../HDP/2.6/services/ACCUMULO/metainfo.xml | 2 +- .../stacks/HDP/2.6/services/FALCON/metainfo.xml | 2 +- .../stacks/HDP/2.6/services/FLUME/metainfo.xml | 2 +- .../stacks/HDP/2.6/services/HBASE/metainfo.xml | 2 +- .../stacks/HDP/2.6/services/HDFS/metainfo.xml | 2 +- .../stacks/HDP/2.6/services/HIVE/metainfo.xml | 2 +- .../stacks/HDP/2.6/services/KAFKA/metainfo.xml | 2 +- .../stacks/HDP/2.6/services/KNOX/metainfo.xml | 2 +- .../stacks/HDP/2.6/services/MAHOUT/metainfo.xml | 2 +- .../stacks/HDP/2.6/services/OOZIE/metainfo.xml | 1 + .../stacks/HDP/2.6/services/PIG/metainfo.xml | 2 +- .../stacks/HDP/2.6/services/RANGER/metainfo.xml | 2 +- .../HDP/2.6/services/RANGER_KMS/metainfo.xml | 2 +- .../stacks/HDP/2.6/services/SLIDER/metainfo.xml | 2 +- .../stacks/HDP/2.6/services/SPARK/metainfo.xml | 2 +- .../stacks/HDP/2.6/services/SPARK2/metainfo.xml | 2 +- .../stacks/HDP/2.6/services/SQOOP/metainfo.xml | 2 +- .../stacks/HDP/2.6/services/STORM/metainfo.xml | 2 +- .../stacks/HDP/2.6/services/TEZ/metainfo.xml | 2 +- .../stacks/HDP/2.6/services/YARN/metainfo.xml | 4 +- .../HDP/2.6/services/ZOOKEEPER/metainfo.xml | 2 +- .../HAPPY/configuration/happy-alert-config.xml | 5 + .../HBASE/configuration/hbase-alert-config.xml | 5 + .../HDFS/configuration/hdfs-alert-config.xml | 5 + .../configuration/sleepy-alert-config.xml | 5 + .../SNOW/configuration/snow-alert-config.xml | 5 + .../YARN/configuration/yarn-alert-config.xml | 5 + .../ZOOKEEPER/configuration/zk-alert-config.xml | 5 + .../server/agent/TestHeartbeatHandler.java | 28 +++-- ambari-web/app/messages.js | 1 - .../configs/objects/service_config_property.js | 7 -- .../widgets/slider_config_widget_view.js | 7 +- contrib/views/ambari-views-package/pom.xml | 4 +- 40 files changed, 269 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/3bbe75c3/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java ----------------------------------------------------------------------
