You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2016/02/24 16:08:08 UTC
[21/50] [abbrv] ambari git commit: Merge branch 'trunk' into
branch-dev-patch-upgrade
Merge branch 'trunk' into branch-dev-patch-upgrade
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d3db8dad
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d3db8dad
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d3db8dad
Branch: refs/heads/trunk
Commit: d3db8daddcdae75f5ccff2760b7bd646e7d63bce
Parents: c11a411 f60472d
Author: Nate Cole <nc...@hortonworks.com>
Authored: Mon Feb 8 09:03:13 2016 -0500
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Mon Feb 8 09:03:13 2016 -0500
----------------------------------------------------------------------
ambari-agent/conf/unix/ambari-agent | 8 +-
ambari-agent/conf/unix/install-helper.sh | 26 +-
ambari-agent/src/packages/tarball/all.xml | 5 -
.../src/main/python/ambari_commons/os_check.py | 27 +-
.../ambari_commons/resources/os_family.json | 10 +-
.../core/providers/__init__.py | 3 +
.../libraries/providers/__init__.py | 3 +
ambari-common/src/main/unix/ambari-python-wrap | 8 +-
.../HDP/2.0.1/services/GANGLIA/metainfo.xml | 4 +-
.../stacks/HDP/2.0.1/services/HDFS/metainfo.xml | 2 +-
.../stacks/HDP/2.0.1/services/HIVE/metainfo.xml | 4 +-
.../HDP/2.0.1/services/OOZIE/metainfo.xml | 2 +-
.../HDP/2.0.5/services/GANGLIA/metainfo.xml | 4 +-
.../stacks/HDP/2.0.5/services/HDFS/metainfo.xml | 2 +-
.../stacks/HDP/2.0.5/services/HIVE/metainfo.xml | 4 +-
.../HDP/2.0.5/services/OOZIE/metainfo.xml | 2 +-
.../stacks/HDP/2.0.7/services/HIVE/metainfo.xml | 4 +-
.../2.1.1/services/AMBARI_METRICS/metainfo.xml | 2 +-
ambari-server/conf/unix/ambari-env.sh | 1 +
ambari-server/conf/unix/install-helper.sh | 24 +-
ambari-server/sbin/ambari-server | 7 +-
ambari-server/src/main/assemblies/server.xml | 5 -
.../src/main/python/ambari_server/utils.py | 5 +-
.../0.1.0/configuration/ams-grafana-ini.xml | 542 ++++++++++---------
.../AMBARI_METRICS/0.1.0/metainfo.xml | 2 +-
.../0.1.0/package/scripts/params.py | 5 +
.../common-services/GANGLIA/3.5.0/metainfo.xml | 4 +-
.../HAWQ/2.0.0/configuration/hawq-site.xml | 12 +
.../HAWQ/2.0.0/package/scripts/utils.py | 6 +-
.../common-services/HDFS/2.1.0.2.0/metainfo.xml | 2 +-
.../HIVE/0.12.0.2.0/metainfo.xml | 4 +-
.../KERBEROS/1.10.3-10/metainfo.xml | 2 +-
.../OOZIE/4.0.0.2.0/metainfo.xml | 2 +-
.../stacks/HDP/2.1/services/HIVE/metainfo.xml | 4 +-
.../stacks/HDP/2.1/services/OOZIE/metainfo.xml | 2 +-
.../resources/stacks/HDP/2.2/repos/repoinfo.xml | 12 +
.../stacks/HDP/2.2/services/FALCON/metainfo.xml | 2 +-
.../stacks/HDP/2.2/services/FLUME/metainfo.xml | 2 +-
.../stacks/HDP/2.2/services/HBASE/metainfo.xml | 2 +-
.../stacks/HDP/2.2/services/HDFS/metainfo.xml | 2 +-
.../stacks/HDP/2.2/services/HIVE/metainfo.xml | 6 +-
.../stacks/HDP/2.2/services/KAFKA/metainfo.xml | 2 +-
.../stacks/HDP/2.2/services/KNOX/metainfo.xml | 2 +-
.../stacks/HDP/2.2/services/OOZIE/metainfo.xml | 2 +-
.../stacks/HDP/2.2/services/PIG/metainfo.xml | 2 +-
.../stacks/HDP/2.2/services/RANGER/metainfo.xml | 2 +-
.../stacks/HDP/2.2/services/SLIDER/metainfo.xml | 2 +-
.../stacks/HDP/2.2/services/SPARK/metainfo.xml | 2 +-
.../stacks/HDP/2.2/services/SQOOP/metainfo.xml | 2 +-
.../stacks/HDP/2.2/services/STORM/metainfo.xml | 2 +-
.../stacks/HDP/2.2/services/TEZ/metainfo.xml | 2 +-
.../stacks/HDP/2.2/services/YARN/metainfo.xml | 4 +-
.../HDP/2.3.ECS/services/ZOOKEEPER/metainfo.xml | 2 +-
.../resources/stacks/HDP/2.3/repos/repoinfo.xml | 12 +
.../HDP/2.3/services/ACCUMULO/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/ATLAS/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/HDFS/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/HIVE/metainfo.xml | 6 +-
.../stacks/HDP/2.3/services/KAFKA/widgets.json | 182 +++++++
.../stacks/HDP/2.3/services/OOZIE/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/PIG/metainfo.xml | 2 +-
.../HDP/2.3/services/RANGER_KMS/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/STORM/widgets.json | 127 +++++
.../HDP/2.3/services/ZOOKEEPER/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/stack_advisor.py | 37 +-
.../resources/stacks/HDP/2.4/repos/repoinfo.xml | 12 +
.../stacks/2.3/common/test_stack_advisor.py | 51 +-
ambari-web/app/assets/test/tests.js | 1 -
.../hawq/addStandby/step3_controller.js | 23 +-
.../main/host/bulk_operations_controller.js | 25 +-
ambari-web/app/controllers/main/host/details.js | 44 +-
ambari-web/app/controllers/main/service/item.js | 7 +-
ambari-web/app/data/service_graph_config.js | 15 -
ambari-web/app/messages.js | 30 +-
.../mixins/common/chart/storm_linear_time.js | 74 ---
.../app/mixins/common/widgets/widget_mixin.js | 2 +-
.../configs/add_component_config_initializer.js | 13 +-
ambari-web/app/views.js | 9 -
.../app/views/common/chart/linear_time.js | 20 -
.../service/info/metrics/kafka/broker_topic.js | 50 --
.../info/metrics/kafka/controller_status.js | 49 --
.../info/metrics/kafka/kafka_controller.js | 41 --
.../info/metrics/kafka/replica_fetcher.js | 41 --
.../info/metrics/kafka/replica_manager.js | 46 --
.../info/metrics/storm/executors_metric.js | 34 --
.../info/metrics/storm/slots_number_metric.js | 42 --
.../service/info/metrics/storm/tasks_metric.js | 34 --
.../info/metrics/storm/topologies_metric.js | 34 --
.../test/controllers/main/host/details_test.js | 97 +++-
.../common/chart/storm_linear_time_test.js | 80 ---
.../resources/ui/scripts/init-ambari-view.js | 5 +-
docs/src/site/apt/index.apt | 2 +-
docs/src/site/apt/whats-new.apt | 24 +-
docs/src/site/site.xml | 2 +
94 files changed, 1052 insertions(+), 1034 deletions(-)
----------------------------------------------------------------------