Merge branch 'trunk' into branch-feature-AMBARI-18634
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/075c1186 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/075c1186 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/075c1186 Branch: refs/heads/trunk Commit: 075c11862faa0f89f507d79bc8d90b2e1f3a8f7b Parents: 6143203 e55f8a8 Author: Nate Cole <[email protected]> Authored: Thu Nov 10 11:09:15 2016 -0500 Committer: Nate Cole <[email protected]> Committed: Thu Nov 10 11:09:15 2016 -0500 ---------------------------------------------------------------------- ambari-server/docs/configuration/index.md | 5 +- .../server/configuration/Configuration.java | 16 + .../server/controller/ControllerModule.java | 5 +- .../dispatchers/AmbariSNMPDispatcher.java | 150 +++++ .../dispatchers/SNMPDispatcher.java | 25 +- .../server/orm/entities/AlertHistoryEntity.java | 3 + .../server/state/alert/AlertDefinitionHash.java | 11 +- .../ambari/server/state/alert/TargetType.java | 7 +- .../services/AlertNoticeDispatchService.java | 19 + .../topology/ClusterConfigurationRequest.java | 41 +- .../server/upgrade/UpgradeCatalog250.java | 67 ++- .../2.1.0.2.0/package/scripts/hdfs_namenode.py | 22 +- .../services/HIVE/configuration/hive-env.xml | 1 + .../configuration/hive-interactive-site.xml | 57 ++ .../HIVE/configuration/tez-interactive-site.xml | 47 ++ .../server/agent/TestHeartbeatHandler.java | 17 +- .../dispatchers/AmbariSNMPDispatcherTest.java | 553 +++++++++++++++++++ .../ClusterConfigurationRequestTest.java | 59 +- .../python/stacks/2.0.6/HDFS/test_namenode.py | 10 +- ambari-web/app/config.js | 3 +- .../main/admin/stack_and_upgrade_controller.js | 47 +- .../main/service/reassign/step4_controller.js | 2 +- .../app/controllers/wizard/step8_controller.js | 5 +- ambari-web/app/messages.js | 1 + ambari-web/app/styles/application.less | 3 + ambari-web/app/styles/stack_versions.less | 3 + .../app/styles/theme/bootstrap-ambari.css | 81 ++- ambari-web/app/templates/application.hbs | 8 +- .../admin/stack_upgrade/upgrade_version_box.hbs | 5 +- .../stack_upgrade/upgrade_version_column.hbs | 5 +- .../templates/main/service/reassign/step1.hbs | 21 +- .../templates/main/service/reassign/step3.hbs | 52 +- .../templates/main/service/reassign/step5.hbs | 22 +- .../configs/service_configs_by_category_view.js | 3 +- .../stack_upgrade/upgrade_version_box_view.js | 4 + .../admin/stack_and_upgrade_controller_test.js | 31 ++ .../test/controllers/wizard/step8_test.js | 8 +- .../upgrade_version_box_view_test.js | 22 + 38 files changed, 1294 insertions(+), 147 deletions(-) ----------------------------------------------------------------------
