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/11/28 21:20:40 UTC
[21/24] ambari git commit: Merge branch 'branch-2.6' into
branch-feature-AMBARI-22457
Merge branch 'branch-2.6' into branch-feature-AMBARI-22457
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/606d876b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/606d876b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/606d876b
Branch: refs/heads/branch-2.6
Commit: 606d876b62cafe64e51022d722128475643116da
Parents: bc8b391 c6825e9
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Mon Nov 27 14:58:58 2017 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Mon Nov 27 14:58:58 2017 +0200
----------------------------------------------------------------------
.../src/main/python/ambari_agent/Hardware.py | 130 +++---
.../src/main/python/ambari_agent/Heartbeat.py | 8 +-
.../src/main/python/ambari_agent/HostInfo.py | 83 ++--
.../test/python/ambari_agent/TestHardware.py | 56 ++-
.../python/ambari_agent/TestRegistration.py | 5 +-
.../core/providers/package/yumrpm.py | 4 +-
.../controller/AmbariManagementController.java | 6 +-
.../AmbariManagementControllerImpl.java | 104 ++---
.../controller/AmbariManagementHelper.java | 201 ++++++++++
.../internal/ExtensionLinkResourceProvider.java | 15 +
.../ambari/server/orm/dao/ExtensionLinkDAO.java | 36 +-
.../orm/entities/ExtensionLinkEntity.java | 1 +
.../ambari/server/stack/ExtensionHelper.java | 88 ++++-
.../ambari/server/stack/ExtensionModule.java | 2 +
.../ambari/server/stack/StackManager.java | 81 +++-
.../apache/ambari/server/stack/StackModule.java | 8 +-
.../ambari/server/state/ExtensionInfo.java | 26 +-
.../apache/ambari/server/state/StackInfo.java | 27 +-
.../state/stack/ExtensionMetainfoXml.java | 11 +
.../server/upgrade/UpgradeCatalog260.java | 171 +++++++-
.../HIVE/0.12.0.2.0/package/scripts/hive.py | 12 +-
.../package/scripts/hive_server_interactive.py | 20 +-
.../stacks/HDP/2.5/services/YARN/kerberos.json | 12 +-
.../stacks/HDP/2.6/services/YARN/kerberos.json | 24 +-
.../stack/StackManagerCommonServicesTest.java | 4 +-
.../server/stack/StackManagerExtensionTest.java | 116 ++++--
.../server/stack/StackManagerMiscTest.java | 13 +-
.../ambari/server/stack/StackManagerMock.java | 5 +-
.../ambari/server/stack/StackManagerTest.java | 13 +-
.../server/upgrade/UpgradeCatalog260Test.java | 129 +++++-
.../stacks/2.0.6/HIVE/test_hive_server.py | 2 +-
.../HIVE/running_withMOTDmsg_andTrailingMsg.txt | 46 +++
.../stacks/2.5/HIVE/test_hive_server_int.py | 21 +
.../resources/extensions/EXT/0.1/metainfo.xml | 2 +-
.../resources/extensions/EXT/0.2/metainfo.xml | 3 +-
.../resources/extensions/EXT/0.3/metainfo.xml | 32 ++
.../EXT/0.3/services/OOZIE2/metainfo.xml | 118 ++++++
.../services/OOZIE2/themes/broken_theme.json | 3 +
.../resources/extensions/EXT/0.4/metainfo.xml | 32 ++
.../EXT/0.4/services/OOZIE2/metainfo.xml | 118 ++++++
.../services/OOZIE2/themes/broken_theme.json | 3 +
.../test_kerberos_descriptor_ranger_kms.json | 286 ++++++++++++++
.../stacks_with_extensions/HDP/0.3/metainfo.xml | 22 ++
.../HDP/0.3/repos/repoinfo.xml | 63 +++
.../HDP/0.3/services/HBASE/metainfo.xml | 26 ++
.../0.3/services/HDFS/configuration/global.xml | 145 +++++++
.../services/HDFS/configuration/hadoop-env.xml | 223 +++++++++++
.../services/HDFS/configuration/hbase-site.xml | 137 +++++++
.../services/HDFS/configuration/hdfs-log4j.xml | 199 ++++++++++
.../services/HDFS/configuration/hdfs-site.xml | 396 +++++++++++++++++++
.../HDP/0.3/services/HDFS/metainfo.xml | 30 ++
.../0.3/services/HDFS/package/dummy-script.py | 20 +
.../HDP/0.3/services/HIVE/metainfo.xml | 26 ++
.../HDP/0.3/services/MAPREDUCE/metainfo.xml | 23 ++
.../HDP/0.3/services/ZOOKEEPER/metainfo.xml | 26 ++
.../stacks_with_extensions/HDP/0.4/metainfo.xml | 22 ++
.../HDP/0.4/repos/repoinfo.xml | 63 +++
.../HDP/0.4/services/HBASE/metainfo.xml | 26 ++
.../0.4/services/HDFS/configuration/global.xml | 145 +++++++
.../services/HDFS/configuration/hadoop-env.xml | 223 +++++++++++
.../services/HDFS/configuration/hbase-site.xml | 137 +++++++
.../services/HDFS/configuration/hdfs-log4j.xml | 199 ++++++++++
.../services/HDFS/configuration/hdfs-site.xml | 396 +++++++++++++++++++
.../HDP/0.4/services/HDFS/metainfo.xml | 30 ++
.../0.4/services/HDFS/package/dummy-script.py | 20 +
.../HDP/0.4/services/HIVE/metainfo.xml | 26 ++
.../HDP/0.4/services/MAPREDUCE/metainfo.xml | 23 ++
.../HDP/0.4/services/ZOOKEEPER/metainfo.xml | 26 ++
.../main/admin/kerberos/step4_controller.js | 6 +
.../app/controllers/wizard/step3_controller.js | 2 +-
ambari-web/app/messages.js | 5 +-
ambari-web/app/mixins/common/serverValidator.js | 41 +-
ambari-web/app/styles/application.less | 3 +-
.../config_recommendation_popup.hbs | 102 +++--
.../config_validation_popup.js | 7 +-
.../test/mixins/common/serverValidator_test.js | 15 +-
.../apache/ambari/view/utils/hdfs/HdfsApi.java | 16 +-
.../apache/ambari/view/utils/hdfs/HdfsUtil.java | 17 +-
.../ui/app/domain/workflow-importer.js | 3 +-
79 files changed, 4584 insertions(+), 382 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/606d876b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/606d876b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
----------------------------------------------------------------------