Merge remote-tracking branch 'origin/trunk' into trunk
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7711dadb Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7711dadb Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7711dadb Branch: refs/heads/trunk Commit: 7711dadb2030da70ddae2633825a1720ee9f7cd9 Parents: 06f9816 d54b747 Author: Oleg Nechiporenko <[email protected]> Authored: Mon Oct 20 20:51:47 2014 +0300 Committer: Oleg Nechiporenko <[email protected]> Committed: Mon Oct 20 20:51:47 2014 +0300 ---------------------------------------------------------------------- .../controllers/ambariViews/ViewsListCtrl.js | 8 +- .../ui/admin-web/app/scripts/routes.js | 2 +- .../app/views/ambariViews/listTable.html | 2 +- .../server/configuration/Configuration.java | 1 + .../ganglia/GangliaHostPropertyProvider.java | 1 + .../ganglia/GangliaPropertyProvider.java | 1 + .../server/upgrade/UpgradeCatalog170.java | 22 + .../scripts/shared_initialization.py | 1 + .../GANGLIA/package/scripts/ganglia_monitor.py | 13 +- .../services/GANGLIA/package/scripts/params.py | 4 + .../stacks/HDP/2.2/services/FALCON/metainfo.xml | 10 +- .../stacks/HDP/2.2/services/FLUME/metainfo.xml | 10 +- .../stacks/HDP/2.2/services/HBASE/metainfo.xml | 10 +- .../services/HDFS/configuration/hadoop-env.xml | 60 +- .../stacks/HDP/2.2/services/HDFS/metainfo.xml | 43 +- .../stacks/HDP/2.2/services/HIVE/metainfo.xml | 22 +- .../KAFKA/configuration/kafka-broker.xml | 5 +- .../stacks/HDP/2.2/services/KAFKA/metainfo.xml | 10 +- .../stacks/HDP/2.2/services/KAFKA/metrics.json | 262 +++++ .../2.2/services/KAFKA/package/scripts/kafka.py | 2 +- .../services/KAFKA/package/scripts/params.py | 2 +- .../stacks/HDP/2.2/services/KNOX/metainfo.xml | 10 +- .../stacks/HDP/2.2/services/OOZIE/metainfo.xml | 25 +- .../stacks/HDP/2.2/services/PIG/metainfo.xml | 10 +- .../stacks/HDP/2.2/services/SLIDER/metainfo.xml | 10 +- .../stacks/HDP/2.2/services/SQOOP/metainfo.xml | 15 +- .../stacks/HDP/2.2/services/STORM/metainfo.xml | 10 +- .../stacks/HDP/2.2/services/TEZ/metainfo.xml | 10 +- .../stacks/HDP/2.2/services/YARN/metainfo.xml | 23 +- .../HDP/2.2/services/ZOOKEEPER/metainfo.xml | 10 +- .../ganglia/GangliaPropertyProviderTest.java | 30 +- .../server/upgrade/UpgradeCatalog170Test.java | 2 +- .../test/python/stacks/2.2/configs/default.json | 2 +- ambari-web/app/controllers/main/host/details.js | 141 +-- ambari-web/app/data/HDP2/site_properties.js | 22 +- ambari-web/app/models/service_config.js | 10 +- ambari-web/app/routes/main.js | 24 +- .../test/controllers/main/host/details_test.js | 986 ++++++++++++++++--- ambari-web/test/models/service_config_test.js | 30 + 39 files changed, 1556 insertions(+), 305 deletions(-) ----------------------------------------------------------------------
