You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2016/11/14 18:27:23 UTC
[10/50] [abbrv] ambari git commit: Merge branch
'branch-feature-AMBARI-18634' into trunk
Merge branch 'branch-feature-AMBARI-18634' into trunk
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f052c2ab
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f052c2ab
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f052c2ab
Branch: refs/heads/branch-dev-patch-upgrade
Commit: f052c2ab894219c36f28013590f4a01a2a1d84c0
Parents: 2a0c941 4c9aabc3
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Wed Nov 9 16:54:30 2016 -0500
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Wed Nov 9 16:54:30 2016 -0500
----------------------------------------------------------------------
.../src/main/python/ambari_commons/constants.py | 1 +
.../libraries/functions/conf_select.py | 2 +-
.../libraries/script/script.py | 34 ++++++++++------
.../internal/UpgradeResourceProvider.java | 20 ++++------
.../4.0.0.2.0/package/scripts/oozie_server.py | 6 +--
.../RANGER/0.4.0/package/scripts/params.py | 2 +-
.../0.4.0/package/scripts/setup_ranger_xml.py | 7 ++--
.../3.4.5/package/scripts/zookeeper.py | 8 ----
.../3.4.5/package/scripts/zookeeper_server.py | 4 +-
.../3.4.5/package/scripts/zookeeper_service.py | 11 -----
.../2.0.6/hooks/before-ANY/scripts/params.py | 4 +-
.../stacks/2.0.6/configs/client-upgrade.json | 2 +-
.../test/python/stacks/2.0.6/configs/nn_eu.json | 2 +-
.../stacks/2.0.6/configs/nn_eu_standby.json | 2 +-
.../python/stacks/2.0.6/configs/nn_ru_lzo.json | 2 +-
.../stacks/2.1/configs/client-upgrade.json | 2 +-
.../2.1/configs/hive-metastore-upgrade.json | 2 +-
.../stacks/2.2/configs/falcon-upgrade.json | 2 +-
.../python/stacks/2.2/configs/hive-upgrade.json | 2 +-
.../journalnode-upgrade-hdfs-secure.json | 2 +-
.../stacks/2.2/configs/journalnode-upgrade.json | 2 +-
.../python/stacks/2.2/configs/knox_upgrade.json | 2 +-
.../stacks/2.2/configs/oozie-downgrade.json | 2 +-
.../stacks/2.2/configs/oozie-upgrade.json | 2 +-
.../2.2/configs/ranger-admin-upgrade.json | 2 +-
.../2.2/configs/ranger-usersync-upgrade.json | 2 +-
.../app/assets/data/stack_versions/upgrade.json | 42 ++++++++++----------
.../HDF/2.0/hooks/before-ANY/scripts/params.py | 4 +-
28 files changed, 79 insertions(+), 96 deletions(-)
----------------------------------------------------------------------