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/10/18 14:18:27 UTC
[13/13] 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/06676d66
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/06676d66
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/06676d66
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 06676d66ee97312bedfe7894a8a5dc8eafe3eef6
Parents: 553e4f9 ee509e0
Author: Robert Levas <rl...@hortonworks.com>
Authored: Wed Oct 18 10:18:07 2017 -0400
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Wed Oct 18 10:18:07 2017 -0400
----------------------------------------------------------------------
ambari-infra/ambari-infra-assembly/pom.xml | 4 +-
.../serveraction/upgrades/ConfigureAction.java | 5 ++
.../ambari/server/state/UpgradeContext.java | 55 ++++++++++++++------
.../ambari/server/state/stack/UpgradePack.java | 30 ++++++++++-
.../state/stack/upgrade/ClusterGrouping.java | 13 +++++
.../state/stack/upgrade/ConfigureTask.java | 16 ++++++
.../0.96.0.2.0/configuration/hbase-site.xml | 17 +++---
.../0.5.0.2.3/package/scripts/kms_server.py | 21 ++++----
.../1.0.0.3.0/package/scripts/kms_server.py | 19 +++----
.../2.1.0.2.0/package/scripts/params_linux.py | 34 ++++++++++--
.../2.1.0.2.0/package/scripts/status_params.py | 52 +++++++-----------
.../YARN/3.0.0.3.0/configuration/yarn-site.xml | 2 +-
.../3.0.0.3.0/package/scripts/params_linux.py | 53 ++++++++++++++-----
.../3.0.0.3.0/package/scripts/status_params.py | 52 +++++++-----------
.../stacks/HDP/2.0.6/role_command_order.json | 2 +-
.../stacks/HDP/2.5/services/stack_advisor.py | 3 +-
.../services/YARN/configuration/yarn-site.xml | 2 +-
.../stacks/HDP/2.6/upgrades/config-upgrade.xml | 7 +++
.../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 7 ++-
.../stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 1 +
.../internal/UpgradeResourceProviderTest.java | 13 +++++
.../ambari/server/state/UpgradeContextTest.java | 38 +++++++++++++-
.../state/stack/ConfigUpgradeValidityTest.java | 10 ++++
.../stacks/2.5/common/test_stack_advisor.py | 5 +-
ambari-web/app/messages.js | 1 +
ambari-web/app/routes/installer.js | 3 +-
ambari-web/app/routes/main.js | 1 +
ambari-web/app/styles/application.less | 3 +-
ambari-web/app/styles/common.less | 2 +-
ambari-web/app/styles/wizard.less | 24 ++++++++-
ambari-web/app/templates/installer.hbs | 2 +-
.../stack_upgrade/upgrade_version_box_view.js | 4 +-
docs/pom.xml | 49 ++++++++++++++++-
33 files changed, 403 insertions(+), 147 deletions(-)
----------------------------------------------------------------------