ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [3/4] ambari git commit: Merge branch 'branch-2.5' into branch-feature-AMBARI-21348
Date Wed, 12 Jul 2017 18:49:13 GMT
Merge branch 'branch-2.5' into branch-feature-AMBARI-21348


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/267cd8b0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/267cd8b0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/267cd8b0

Branch: refs/heads/branch-2.5
Commit: 267cd8b0cee17dc84be2b075b7168cd2518f02b6
Parents: d852928 a6ac40b
Author: Jonathan Hurley <jhurley@hortonworks.com>
Authored: Wed Jul 12 14:46:40 2017 -0400
Committer: Jonathan Hurley <jhurley@hortonworks.com>
Committed: Wed Jul 12 14:46:40 2017 -0400

----------------------------------------------------------------------
 .../libraries/functions/stack_features.py       |  28 ++--
 .../actionmanager/ExecutionCommandWrapper.java  |   3 +-
 .../ambari/server/agent/ExecutionCommand.java   |  14 +-
 .../controller/ActionExecutionContext.java      |  30 +++--
 .../controller/AmbariActionExecutionHelper.java |   8 +-
 .../ClusterStackVersionResourceProvider.java    |   2 +-
 .../internal/UpgradeResourceProvider.java       | 107 +++++++++-------
 .../upgrades/FinalizeUpgradeAction.java         |  18 +--
 .../upgrades/UpgradeUserKerberosDescriptor.java |  41 ++----
 .../ambari/server/state/UpgradeContext.java     |  31 +++--
 .../ambari/server/topology/AmbariContext.java   |  30 ++++-
 .../HBASE/0.96.0.2.0/package/scripts/hbase.py   |  12 +-
 .../0.96.0.2.0/package/scripts/params_linux.py  |   3 +
 .../HIVE/0.12.0.2.0/package/scripts/hive.py     |   3 +-
 .../0.12.0.2.0/package/scripts/params_linux.py  |   2 +
 .../SPARK/1.2.1/package/scripts/params.py       |  11 +-
 .../SPARK/1.2.1/package/scripts/setup_spark.py  |   6 +-
 .../1.2.1/package/scripts/spark_service.py      |   6 +-
 .../BigInsights/4.2.5/role_command_order.json   |  12 +-
 .../BigInsights/4.2.5/services/stack_advisor.py |  53 --------
 .../BigInsights/4.2/role_command_order.json     |   3 +-
 .../4.2/services/SYSTEMML/metainfo.xml          |  77 -----------
 .../SYSTEMML/package/scripts/__init__.py        |  19 ---
 .../services/SYSTEMML/package/scripts/params.py |  40 ------
 .../SYSTEMML/package/scripts/service_check.py   |  43 -------
 .../SYSTEMML/package/scripts/systemml_client.py |  49 -------
 .../services/TITAN/configuration/titan-env.xml  |  48 -------
 .../TITAN/configuration/titan-hbase-solr.xml    |  67 ----------
 .../TITAN/configuration/titan-log4j.xml         |  66 ----------
 .../4.2/services/TITAN/kerberos.json            |  17 ---
 .../BigInsights/4.2/services/TITAN/metainfo.xml |  88 -------------
 .../TITAN/package/files/titanSmoke.groovy       |  20 ---
 .../services/TITAN/package/scripts/params.py    | 128 -------------------
 .../TITAN/package/scripts/service_check.py      |  64 ----------
 .../4.2/services/TITAN/package/scripts/titan.py |  70 ----------
 .../TITAN/package/scripts/titan_client.py       |  58 ---------
 .../resources/stacks/HDP/2.6/repos/repoinfo.xml |   6 +-
 .../services/HIVE/configuration/hive-site.xml   |  35 +++++
 .../ComponentVersionCheckActionTest.java        |   1 -
 .../upgrades/UpgradeActionTest.java             |   2 -
 .../UpgradeUserKerberosDescriptorTest.java      |  19 +--
 .../src/test/python/TestStackFeature.py         |  44 +++++--
 .../python/custom_actions/test_ru_set_all.py    |   6 +-
 .../stacks/2.0.6/HIVE/test_hive_server.py       |   2 +
 .../test/python/stacks/2.0.6/configs/nn_eu.json |   2 +-
 .../stacks/2.0.6/configs/nn_eu_standby.json     |   2 +-
 .../2.1/configs/hive-metastore-upgrade.json     |   2 +-
 .../python/stacks/2.2/configs/knox_upgrade.json |   2 +-
 ambari-web/app/controllers/main/service.js      |  13 +-
 ambari-web/app/utils/ajax/ajax.js               |  22 ++++
 .../test/controllers/main/service_test.js       |   4 +-
 51 files changed, 321 insertions(+), 1118 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/267cd8b0/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
----------------------------------------------------------------------


Mime
View raw message