[3/4] ambari git commit: Merge branch 'branch-2.5' into branch-feature-AMBARI-21348

2017-07-13 Thread jonathanhurley 
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/133baa53
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/133baa53
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/133baa53

Branch: refs/heads/branch-2.5
Commit: 133baa53fac0e6a6bb372e4183172236920fd54c
Parents: 94eb0dd a389f85
Author: Jonathan Hurley 
Authored: Thu Jul 13 12:38:57 2017 -0400
Committer: Jonathan Hurley 
Committed: Thu Jul 13 12:38:57 2017 -0400

--
 .../libraries/functions/stack_tools.py  |  13 ++
 .../upgrades/ChangeStackReferencesAction.java   |   4 +-
 .../0.96.0.2.0/package/scripts/hbase_master.py  |  10 +-
 .../0.96.0.2.0/package/scripts/hbase_service.py |  41 ++--
 .../0.12.0.2.0/package/scripts/params_linux.py  |   4 +
 .../0.12.0.2.0/package/scripts/service_check.py |   3 +-
 .../common-services/JNBG/0.2.0/alerts.json  |  32 +++
 .../JNBG/0.2.0/configuration/jnbg-env.xml   | 209 +++
 .../common-services/JNBG/0.2.0/kerberos.json|  59 ++
 .../common-services/JNBG/0.2.0/metainfo.xml | 108 ++
 .../JNBG/0.2.0/package/files/jkg_install.sh | 169 +++
 .../JNBG/0.2.0/package/files/jkg_start.sh   |  84 
 .../JNBG/0.2.0/package/files/log4j_setup.sh |  79 +++
 .../0.2.0/package/files/pyspark_configure.sh| 104 +
 .../JNBG/0.2.0/package/files/pythonenv_setup.sh | 138 
 .../JNBG/0.2.0/package/files/toree_configure.sh | 151 ++
 .../JNBG/0.2.0/package/files/toree_install.sh   | 176 
 .../JNBG/0.2.0/package/scripts/jkg_toree.py | 134 
 .../0.2.0/package/scripts/jkg_toree_params.py   | 177 
 .../JNBG/0.2.0/package/scripts/jnbg_helpers.py  |  81 +++
 .../JNBG/0.2.0/package/scripts/jnbg_params.py   |  66 ++
 .../JNBG/0.2.0/package/scripts/py_client.py |  63 ++
 .../0.2.0/package/scripts/py_client_params.py   |  39 
 .../JNBG/0.2.0/package/scripts/service_check.py |  44 
 .../JNBG/0.2.0/package/scripts/status_params.py |  26 +++
 .../0.5.0.2.2/package/scripts/params_linux.py   |   8 +
 .../KNOX/0.5.0.2.2/package/scripts/upgrade.py   |   2 +-
 .../R4ML/0.8.0/configuration/r4ml-env.xml   |  48 +
 .../common-services/R4ML/0.8.0/metainfo.xml |  92 
 .../R4ML/0.8.0/package/files/Install.R  |  25 +++
 .../R4ML/0.8.0/package/files/ServiceCheck.R |  28 +++
 .../R4ML/0.8.0/package/files/localr.repo|  22 ++
 .../R4ML/0.8.0/package/scripts/__init__.py  |  19 ++
 .../R4ML/0.8.0/package/scripts/params.py|  80 +++
 .../R4ML/0.8.0/package/scripts/r4ml_client.py   | 201 ++
 .../R4ML/0.8.0/package/scripts/service_check.py |  45 
 .../SYSTEMML/0.10.0/metainfo.xml|  77 +++
 .../SYSTEMML/0.10.0/package/scripts/__init__.py |  19 ++
 .../SYSTEMML/0.10.0/package/scripts/params.py   |  40 
 .../0.10.0/package/scripts/service_check.py |  43 
 .../0.10.0/package/scripts/systemml_client.py   |  49 +
 .../common-services/TITAN/1.0.0/alerts.json |  33 +++
 .../1.0.0/configuration/gremlin-server.xml  |  85 
 .../TITAN/1.0.0/configuration/hadoop-gryo.xml   |  94 +
 .../1.0.0/configuration/hadoop-hbase-read.xml   | 102 +
 .../TITAN/1.0.0/configuration/titan-env.xml | 157 ++
 .../1.0.0/configuration/titan-hbase-solr.xml|  69 ++
 .../TITAN/1.0.0/configuration/titan-log4j.xml   |  65 ++
 .../common-services/TITAN/1.0.0/kerberos.json   |  52 +
 .../common-services/TITAN/1.0.0/metainfo.xml| 124 +++
 .../package/alerts/alert_check_titan_server.py  |  65 ++
 .../package/files/gremlin-server-script.sh  |  86 
 .../package/files/tinkergraph-empty.properties  |  18 ++
 .../TITAN/1.0.0/package/files/titanSmoke.groovy |  20 ++
 .../TITAN/1.0.0/package/scripts/params.py   | 202 ++
 .../1.0.0/package/scripts/params_server.py  |  37 
 .../1.0.0/package/scripts/service_check.py  |  88 
 .../TITAN/1.0.0/package/scripts/titan.py| 143 +
 .../TITAN/1.0.0/package/scripts/titan_client.py |  61 ++
 .../TITAN/1.0.0/package/scripts/titan_server.py |  67 ++
 .../1.0.0/package/scripts/titan_service.py  | 150 +
 .../templates/titan_solr_client_jaas.conf.j2|  23 ++
 .../package/templates/titan_solr_jaas.conf.j2   |  26 +++
 .../BigInsights/4.2.5/role_command_order.json   |  12 +-
 .../4.2.5/services/JNBG/metainfo.xml|  26 +++
 .../4.2.5/services/R4ML/metainfo.xml|  37 
 .../4.2.5/services/SYSTEMML/metainfo.xml|  37 
 .../4.2.5/services/TITAN/metainfo.xml   |  40 
 .../BigInsights/4.2.5/services/stack_advisor.py |  53

[3/4] ambari git commit: Merge branch 'branch-2.5' into branch-feature-AMBARI-21348

2017-07-12 Thread jonathanhurley 
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 
Authored: Wed Jul 12 14:46:40 2017 -0400
Committer: Jonathan Hurley 
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
--