You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2017/07/14 10:41:44 UTC
[5/5] ambari git commit: Merge branch 'trunk' into
branch-feature-AMBARI-20859
Merge branch 'trunk' into branch-feature-AMBARI-20859
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3adbbadc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3adbbadc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3adbbadc
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 3adbbadc3ecefee51a3bdc72ff6db1b0dbaa5a75
Parents: 7a0850b 63186bf
Author: Robert Levas <rl...@hortonworks.com>
Authored: Fri Jul 14 06:41:33 2017 -0400
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Fri Jul 14 06:41:33 2017 -0400
----------------------------------------------------------------------
.../libraries/functions/stack_features.py | 28 ++--
.../controller/ActionExecutionContext.java | 30 ++--
.../controller/AmbariActionExecutionHelper.java | 15 +-
.../ClusterStackVersionResourceProvider.java | 2 +-
.../upgrades/UpgradeUserKerberosDescriptor.java | 142 +++++++-----------
.../ambari/server/state/UpgradeContext.java | 16 +-
.../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 +-
.../0.6.0.2.5/configuration/zeppelin-env.xml | 2 +-
.../stacks/HDP/2.5/services/stack_advisor.py | 5 +-
.../src/main/resources/stacks/stack_advisor.py | 19 ++-
.../UpgradeUserKerberosDescriptorTest.java | 59 ++++++--
.../src/test/python/TestStackFeature.py | 44 ++++--
.../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 +-
.../stacks/2.5/common/test_stack_advisor.py | 150 +++++++++++--------
.../hive20/src/main/resources/ui/package.json | 1 +
.../src/main/resources/ui/package.json | 1 +
21 files changed, 307 insertions(+), 238 deletions(-)
----------------------------------------------------------------------