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/06/21 18:06:09 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/8f03fd04
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8f03fd04
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8f03fd04
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 8f03fd044b805f350ca9ace6683a969a82b6c8f8
Parents: f5ca114 e7fc3a6
Author: Robert Levas <rl...@hortonworks.com>
Authored: Wed Jun 21 14:05:43 2017 -0400
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Wed Jun 21 14:05:43 2017 -0400
----------------------------------------------------------------------
.../libraries/providers/hdfs_resource.py | 9 +-
ambari-funtest/pom.xml | 5 --
.../metrics2/sink/timeline/Precision.java | 2 +-
.../ambari-metrics-host-monitoring/pom.xml | 1 +
ambari-metrics/pom.xml | 71 +++++++--------
ambari-project/pom.xml | 23 ++++-
ambari-server/pom.xml | 95 ++++++++------------
.../internal/UpgradeResourceProvider.java | 4 +-
.../state/stack/upgrade/ClusterGrouping.java | 4 +-
.../server/state/stack/upgrade/ExecuteTask.java | 2 +-
.../server/state/stack/upgrade/Grouping.java | 2 +-
.../state/stack/upgrade/StageWrapper.java | 2 +-
.../main/python/ambari_server/serverUpgrade.py | 22 ++++-
.../1.4.0.2.0/configuration/flume-log4j.xml | 10 +--
.../configuration/ranger-hive-security.xml | 9 ++
.../RANGER/0.4.0/package/scripts/params.py | 4 +-
.../0.4.0/package/scripts/setup_ranger_xml.py | 12 ++-
.../0.5.0/configuration/ranger-ugsync-site.xml | 3 +
.../configuration/ranger-ugsync-site.xml | 3 +
.../0.6.0.2.5/configuration/zeppelin-config.xml | 7 ++
.../HIVE/configuration/ranger-hive-security.xml | 33 +++++++
.../stacks/HDP/2.6/upgrades/config-upgrade.xml | 10 +++
.../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 4 +
.../stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 1 +
.../3.0/hooks/before-INSTALL/scripts/params.py | 2 +
.../scripts/repo_initialization.py | 8 ++
.../internal/UpgradeResourceProviderTest.java | 2 +-
.../src/test/python/TestAmbariServer.py | 35 +++++++-
.../python/stacks/2.0.6/FLUME/test_flume.py | 10 +--
.../test/python/stacks/2.6/configs/default.json | 3 +-
ambari-web/pom.xml | 65 ++++++--------
31 files changed, 294 insertions(+), 169 deletions(-)
----------------------------------------------------------------------