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/02/24 16:07:49 UTC
[02/50] [abbrv] ambari git commit: Merge branch 'trunk' into
branch-dev-patch-upgrade
Merge branch 'trunk' into branch-dev-patch-upgrade
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4b36397f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4b36397f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4b36397f
Branch: refs/heads/trunk
Commit: 4b36397ffd14f2afed81f0c8d16ce2d2e709530f
Parents: f40df6b 09d3e8b
Author: Nate Cole <nc...@hortonworks.com>
Authored: Tue Jan 19 13:26:47 2016 -0500
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Tue Jan 19 13:26:47 2016 -0500
----------------------------------------------------------------------
.../python/resource_management/core/shell.py | 10 +-
.../libraries/functions/ranger_functions.py | 8 +-
.../libraries/functions/ranger_functions_v2.py | 8 +-
.../server/controller/KerberosHelper.java | 41 +++-
.../server/controller/KerberosHelperImpl.java | 210 +++++++++++++++++--
.../BlueprintConfigurationProcessor.java | 5 -
.../serveraction/ServerActionExecutor.java | 8 +
.../AbstractPrepareKerberosServerAction.java | 90 +++++---
.../PrepareDisableKerberosServerAction.java | 2 +-
.../PrepareEnableKerberosServerAction.java | 2 +-
.../PrepareKerberosIdentitiesServerAction.java | 3 +-
.../upgrades/SparkShufflePropertyConfig.java | 14 +-
.../ambari/server/state/ConfigHelper.java | 7 +-
.../server/state/cluster/ClusterImpl.java | 11 +-
.../server/state/stack/upgrade/Grouping.java | 125 +++++++----
.../stack/upgrade/StageWrapperBuilder.java | 2 +-
.../ambari/server/state/stack/upgrade/Task.java | 8 +
.../server/state/stack/upgrade/TaskWrapper.java | 13 ++
.../state/stack/upgrade/TaskWrapperBuilder.java | 10 +
.../svccomphost/ServiceComponentHostImpl.java | 65 ++++--
.../topology/ClusterConfigurationRequest.java | 17 +-
.../python/ambari_server/serverConfiguration.py | 15 +-
.../main/resources/Ambari-DDL-Derby-CREATE.sql | 12 ++
.../main/resources/Ambari-DDL-MySQL-CREATE.sql | 11 +
.../main/resources/Ambari-DDL-Oracle-CREATE.sql | 11 +
.../resources/Ambari-DDL-Postgres-CREATE.sql | 12 ++
.../Ambari-DDL-Postgres-EMBEDDED-CREATE.sql | 13 ++
.../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 10 +
.../resources/Ambari-DDL-SQLServer-CREATE.sql | 11 +
.../0.96.0.2.0/configuration/hbase-env.xml | 2 +-
.../HBASE/0.96.0.2.0/package/scripts/hbase.py | 5 +-
.../0.96.0.2.0/package/scripts/params_linux.py | 2 -
.../STORM/0.9.1.2.1/package/scripts/storm.py | 11 -
.../stacks/HDP/2.0.6/services/stack_advisor.py | 2 +-
.../HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml | 5 +-
.../HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml | 29 +--
.../HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml | 29 +--
.../HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml | 31 +--
.../stacks/HDP/2.2/upgrades/upgrade-2.2.xml | 8 +-
.../stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 8 +-
.../stacks/HDP/2.2/upgrades/upgrade-2.4.xml | 10 +-
.../stacks/HDP/2.3/role_command_order.json | 4 +-
.../stacks/HDP/2.3/services/stack_advisor.py | 8 +
.../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml | 29 +--
.../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 31 +--
.../stacks/HDP/2.3/upgrades/upgrade-2.3.xml | 8 +-
.../stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 29 ++-
.../services/YARN/configuration/yarn-site.xml | 14 +-
.../stacks/HDP/2.4/services/stack_advisor.py | 78 +------
.../HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml | 29 +--
.../stacks/HDP/2.4/upgrades/upgrade-2.4.xml | 8 +-
.../StackAdvisorBlueprintProcessorTest.java | 3 +
.../server/controller/KerberosHelperTest.java | 46 +++-
.../SparkShufflePropertyConfigTest.java | 43 +---
.../ambari/server/state/ConfigHelperTest.java | 52 ++++-
.../ambari/server/state/UpgradeHelperTest.java | 168 ++++++++++++---
.../ClusterConfigurationRequestTest.java | 3 +-
.../src/test/python/TestAmbariServer.py | 38 +++-
.../stacks/2.0.6/HBASE/test_hbase_client.py | 4 -
.../stacks/2.0.6/HBASE/test_hbase_master.py | 6 -
.../2.0.6/HBASE/test_hbase_regionserver.py | 8 -
.../2.0.6/HBASE/test_phoenix_queryserver.py | 4 -
.../stacks/2.3/common/test_stack_advisor.py | 60 ++++++
.../HDP/2.0.7/services/OOZIE/metainfo.xml | 176 ++++++++++++++++
.../HDP/2.1.1/upgrades/upgrade_bucket_test.xml | 20 +-
.../upgrades/upgrade_nonrolling_new_stack.xml | 6 +-
.../stacks/HDP/2.1.1/upgrades/upgrade_test.xml | 45 +++-
ambari-web/app/controllers/main/service/item.js | 25 ++-
ambari-web/app/messages.js | 3 +-
.../configs/config_recommendation_parser.js | 9 +-
...onfig_with_override_recommendation_parser.js | 2 +-
.../mixins/common/configs/enhanced_configs.js | 13 +-
ambari-web/app/templates/main/host/details.hbs | 2 +-
ambari-web/app/views/common/controls_view.js | 7 +-
.../app/views/common/quick_view_link_view.js | 5 +-
.../test/controllers/main/service/item_test.js | 12 ++
.../config_recommendation_parser_test.js | 27 ++-
.../test/views/common/quick_link_view_test.js | 51 +++++
78 files changed, 1359 insertions(+), 613 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b36397f/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b36397f/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b36397f/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b36397f/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b36397f/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b36397f/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b36397f/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b36397f/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
----------------------------------------------------------------------