ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [17/17] ambari git commit: Merge remote-tracking branch 'origin/trunk' into branch-dev-patch-upgrade
Date Mon, 26 Oct 2015 14:19:26 GMT
Merge remote-tracking branch 'origin/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/ab031a3c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ab031a3c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ab031a3c

Branch: refs/heads/branch-dev-patch-upgrade
Commit: ab031a3c8a116d041f96582e5c125d8fca53b795
Parents: b25c8a8 402d979
Author: Nate Cole <ncole@hortonworks.com>
Authored: Mon Oct 26 10:18:39 2015 -0400
Committer: Nate Cole <ncole@hortonworks.com>
Committed: Mon Oct 26 10:18:39 2015 -0400

----------------------------------------------------------------------
 .../pluggable_stack_definition/configs/PHD.json |   3 +
 .../resource_management/core/environment.py     |   4 +
 .../libraries/script/script.py                  |  14 +-
 .../metrics2/sink/timeline/Precision.java       |  63 ++++++
 .../timeline/HBaseTimelineMetricStore.java      |   1 +
 .../metrics/timeline/PhoenixHBaseAccessor.java  |  12 +-
 .../metrics/timeline/Precision.java             |  48 ----
 .../metrics/timeline/TimelineMetricStore.java   |   1 +
 .../metrics/timeline/query/Condition.java       |   2 +-
 .../timeline/query/DefaultCondition.java        |   2 +-
 .../metrics/timeline/query/EmptyCondition.java  |   2 +-
 .../timeline/query/PhoenixTransactSQL.java      | 224 +++++++++----------
 .../query/SplitByMetricNamesCondition.java      |   2 +-
 .../webapp/TimelineWebServices.java             |   2 +-
 .../timeline/ITPhoenixHBaseAccessor.java        |   1 +
 .../timeline/PhoenixHBaseAccessorTest.java      |   1 +
 .../timeline/TestPhoenixTransactSQL.java        |   7 +-
 .../timeline/TestTimelineMetricStore.java       |   1 +
 .../internal/AbstractProviderModule.java        | 114 +++++++---
 .../internal/UpgradeResourceProvider.java       |   4 +-
 .../controller/metrics/MetricHostProvider.java  |   4 +-
 .../metrics/timeline/AMSPropertyProvider.java   |   3 +-
 .../timeline/AMSReportPropertyProvider.java     |   2 +-
 .../cache/TimelineMetricCacheEntryFactory.java  |  59 +++--
 .../cache/TimelineMetricsCacheValue.java        |  14 +-
 .../stack/upgrade/ServiceCheckGrouping.java     |  11 -
 .../server/upgrade/AbstractUpgradeCatalog.java  |   2 +-
 .../server/upgrade/SchemaUpgradeHelper.java     |   5 +-
 .../server/upgrade/UpgradeCatalog2121.java      | 169 ++++++++++++++
 .../server/upgrade/UpgradeCatalog213.java       |   2 +-
 .../server/upgrade/UpgradeCatalog220.java       |   2 +-
 .../1.6.1.2.2.0/package/scripts/params.py       |  19 +-
 .../0.1.0/configuration/ams-site.xml            |   6 +-
 .../0.1.0/package/scripts/params.py             |  19 +-
 .../0.1.0/package/scripts/service_check.py      |   8 +-
 .../hadoop-metrics2-hbase.properties.j2         |   8 +-
 .../package/templates/metric_monitor.ini.j2     |   2 +-
 .../FLUME/1.4.0.2.0/package/scripts/params.py   |  18 +-
 .../0.96.0.2.0/package/scripts/params_linux.py  |  18 +-
 .../2.1.0.2.0/package/scripts/hdfs_namenode.py  |   4 +-
 .../KAFKA/0.8.1.2.2/package/scripts/params.py   |  20 +-
 .../0.5.0.2.2/configuration/admin-topology.xml  |  96 ++++++++
 .../common-services/KNOX/0.5.0.2.2/metainfo.xml |   2 +
 .../KNOX/0.5.0.2.2/package/scripts/knox.py      |  17 ++
 .../0.5.0.2.2/package/scripts/params_linux.py   |   2 +
 .../0.5.0.2.2/package/scripts/params_windows.py |   2 +
 .../RANGER/0.4.0/package/scripts/params.py      |   3 +-
 .../0.4.0/package/scripts/setup_ranger_xml.py   |  12 +
 .../0.9.1.2.1/package/scripts/params_linux.py   |  16 +-
 .../0.9.1.2.1/package/templates/config.yaml.j2  |   2 +-
 .../templates/storm-metrics2.properties.j2      |   2 +-
 .../2.1.0.2.0/package/scripts/params_linux.py   |   1 +
 .../YARN/2.1.0.2.0/package/scripts/service.py   |   7 +
 .../2.0.6/hooks/before-START/scripts/params.py  |  24 +-
 .../services/HIVE/configuration/hive-site.xml   |   2 +-
 .../HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml |  14 +-
 .../HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml |  14 +-
 .../HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml |  14 +-
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml |  14 +-
 .../KNOX/configuration/knoxsso-topology.xml     |  93 ++++++++
 .../2.1/hooks/before-START/scripts/params.py    |  23 +-
 .../internal/UpgradeResourceProviderTest.java   |   4 +-
 .../metrics/JMXPropertyProviderTest.java        |   2 +-
 .../RestMetricsPropertyProviderTest.java        |   2 +-
 .../ganglia/GangliaPropertyProviderTest.java    |   2 +-
 .../GangliaReportPropertyProviderTest.java      |   2 +-
 .../timeline/AMSPropertyProviderTest.java       |   2 +-
 .../cache/TimelineMetricCacheSizingTest.java    |   3 +-
 .../timeline/cache/TimelineMetricCacheTest.java | 121 +++++++++-
 .../ambari/server/state/UpgradeHelperTest.java  |   1 -
 .../server/upgrade/UpgradeCatalog2121Test.java  | 118 ++++++++++
 .../server/upgrade/UpgradeCatalog220Test.java   |   2 +-
 .../python/stacks/2.0.6/FLUME/test_flume.py     |   2 +-
 .../python/stacks/2.0.6/HDFS/test_namenode.py   |  18 +-
 .../python/stacks/2.0.6/configs/default.json    |  20 +-
 .../stacks/2.1/YARN/test_apptimelineserver.py   |   5 +
 .../python/stacks/2.2/KNOX/test_knox_gateway.py |  10 +
 .../test/python/stacks/2.2/configs/default.json |   4 +
 .../main/admin/stack_and_upgrade_controller.js  |  23 +-
 .../main/service/reassign/step4_controller.js   |   4 +-
 ambari-web/app/messages.js                      |   4 +
 ambari-web/app/models/stack_service.js          |   2 +-
 ambari-web/app/styles/application.less          |   9 +
 ambari-web/app/styles/stack_versions.less       |  30 ++-
 .../modal_popups/cluster_check_dialog.hbs       |   3 +
 .../stack_upgrade/stack_upgrade_wizard.hbs      |   7 +-
 .../admin/stack_upgrade/upgrade_options.hbs     |  34 +--
 ambari-web/app/templates/main/service/item.hbs  |  10 +-
 ambari-web/app/utils/ajax/ajax.js               |   2 +-
 .../app/views/common/chart/linear_time.js       |   6 +-
 .../common/modal_popups/cluster_check_popup.js  |   3 +-
 .../app/views/common/quick_view_link_view.js    |  43 +++-
 .../admin/stack_and_upgrade_controller_test.js  |  13 +-
 .../test/views/common/chart/linear_time_test.js |  25 ++-
 .../test/views/common/quick_link_view_test.js   |  12 +-
 95 files changed, 1376 insertions(+), 435 deletions(-)
----------------------------------------------------------------------



Mime
View raw message