Merge branch 'trunk' into branch-alerts-dev
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7a0f5091 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7a0f5091 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7a0f5091 Branch: refs/heads/branch-alerts-dev Commit: 7a0f5091784d80b3ea3da535534850f8b6be5201 Parents: c13730a b6abb3d Author: Jonathan Hurley <jhur...@hortonworks.com> Authored: Tue Sep 2 08:12:12 2014 -0400 Committer: Jonathan Hurley <jhur...@hortonworks.com> Committed: Tue Sep 2 08:12:12 2014 -0400 ---------------------------------------------------------------------- ambari-agent/conf/unix/install-helper.sh | 6 - ambari-server/conf/unix/install-helper.sh | 6 - .../apache/ambari/server/state/ConfigImpl.java | 2 +- .../state/configgroup/ConfigGroupImpl.java | 3 +- .../services/HIVE/configuration/hive-env.xml | 2 +- .../1.3.2/services/HIVE/package/scripts/hive.py | 8 +- .../services/HIVE/package/scripts/params.py | 4 + .../services/HIVE/configuration/hive-env.xml | 2 +- .../2.0.6/services/HIVE/package/scripts/hive.py | 10 +- .../services/HIVE/package/scripts/params.py | 4 + .../stacks/HDP/2.0.6/services/YARN/metainfo.xml | 1 - .../stacks/HDP/2.1/services/FALCON/metainfo.xml | 4 + .../server/state/cluster/ClusterTest.java | 22 + .../stacks/1.3.2/HIVE/test_hive_client.py | 8 +- .../stacks/1.3.2/HIVE/test_hive_metastore.py | 4 +- .../stacks/1.3.2/HIVE/test_hive_server.py | 4 +- .../python/stacks/1.3.2/configs/default.json | 4 +- .../stacks/1.3.2/configs/default_client.json | 600 ++++++++++++++ .../python/stacks/1.3.2/configs/secured.json | 2 +- .../stacks/1.3.2/configs/secured_client.json | 786 ++++++++++++++++++ .../stacks/2.0.6/HIVE/test_hive_client.py | 8 +- .../stacks/2.0.6/HIVE/test_hive_metastore.py | 4 +- .../stacks/2.0.6/HIVE/test_hive_server.py | 4 +- .../python/stacks/2.0.6/configs/default.json | 4 +- .../stacks/2.0.6/configs/default_client.json | 797 ++++++++++++++++++ .../python/stacks/2.0.6/configs/secured.json | 4 +- .../stacks/2.0.6/configs/secured_client.json | 818 +++++++++++++++++++ .../stacks/2.1/HIVE/test_hive_metastore.py | 4 +- .../test/python/stacks/2.1/configs/default.json | 4 +- .../test/python/stacks/2.1/configs/secured.json | 4 +- .../resourceManager/wizard_controller.js | 12 + .../controllers/main/service/info/configs.js | 53 +- ambari-web/app/messages.js | 1 + ambari-web/app/models/service_config.js | 6 +- .../app/routes/rm_high_availability_routes.js | 20 +- .../common/configs/config_history_flow.hbs | 8 +- .../common/configs/save_configuration.hbs | 6 +- .../views/common/configs/config_history_flow.js | 32 +- .../main/dashboard/widgets/pie_chart_widget.js | 7 +- .../resources/ui/app/assets/data/apps/apps.json | 675 ++++++++++++--- .../ui/app/controllers/slider_app_controller.js | 4 +- .../main/resources/ui/app/models/slider_app.js | 51 +- .../ui/app/templates/slider_app/configs.hbs | 84 +- 43 files changed, 3788 insertions(+), 304 deletions(-) ----------------------------------------------------------------------