You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2017/08/17 18:58:56 UTC
[07/21] ambari git commit: Merge branch 'branch-2.6' into
branch-feature-AMBARI-21450
Merge branch 'branch-2.6' into branch-feature-AMBARI-21450
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bbd75113
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bbd75113
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bbd75113
Branch: refs/heads/branch-2.6
Commit: bbd751130f6e3d71018aa29379f6630b63db7f89
Parents: c35a834 2d52cfb
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Mon Aug 14 16:17:39 2017 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Mon Aug 14 16:17:39 2017 -0400
----------------------------------------------------------------------
.../libraries/functions/check_process_status.py | 20 ++
.../libraries/functions/get_stack_version.py | 2 +-
.../libraries/script/script.py | 4 +-
.../MetricCollectorHAController.java | 2 +-
.../server/api/predicate/QueryParser.java | 4 +-
.../api/predicate/operators/InOperator.java | 2 +-
.../server/controller/AuthToLocalBuilder.java | 338 +++++++++++--------
.../BlueprintConfigurationProcessor.java | 18 +-
.../internal/StackAdvisorResourceProvider.java | 20 +-
.../apache/ambari/server/orm/DBAccessor.java | 10 +
.../ambari/server/orm/DBAccessorImpl.java | 7 +
.../server/upgrade/UpgradeCatalog252.java | 1 +
.../src/main/python/azuredb_create_generator.py | 2 +-
.../DRUID/0.9.2/package/scripts/druid.py | 6 -
.../DRUID/0.9.2/package/scripts/params.py | 13 -
.../2.1.0.2.0/package/scripts/hdfs_snamenode.py | 6 +
.../HDFS/2.1.0.2.0/package/scripts/utils.py | 1 +
.../scripts/alerts/alert_spark_thrift_port.py | 2 +-
.../scripts/alerts/alert_spark2_thrift_port.py | 2 +-
.../resources/host_scripts/alert_disk_space.py | 2 +-
.../scripts/shared_initialization.py | 15 -
.../HDFS/package/scripts/hdfs_snamenode.py | 6 +
.../0.8/services/HDFS/package/scripts/utils.py | 3 +
.../4.0/services/HDFS/package/scripts/utils.py | 2 +
.../4.2/services/HDFS/package/scripts/utils.py | 2 +
.../scripts/shared_initialization.py | 16 +-
.../stacks/HDP/2.5/upgrades/config-upgrade.xml | 10 +-
.../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 4 +
.../stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 1 +
.../ATLAS/configuration/atlas-log4j.xml | 4 +-
.../stacks/HDP/2.6/upgrades/config-upgrade.xml | 5 +
.../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 4 +
.../stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 1 +
.../ExecutionCommandWrapperTest.java | 12 +-
.../server/api/predicate/QueryParserTest.java | 18 +
.../controller/AuthToLocalBuilderTest.java | 45 +++
.../BlueprintConfigurationProcessorTest.java | 34 +-
.../StackAdvisorResourceProviderTest.java | 26 ++
.../scripts/shared_initialization.py | 14 -
39 files changed, 438 insertions(+), 246 deletions(-)
----------------------------------------------------------------------