ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rle...@apache.org
Subject [21/21] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-20859
Date Wed, 19 Jul 2017 12:39:14 GMT
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/903cd1a0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/903cd1a0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/903cd1a0

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 903cd1a06c9016efeb3be29c7a323746960ab2e5
Parents: 3adbbad 56f05f0
Author: Robert Levas <rlevas@hortonworks.com>
Authored: Wed Jul 19 08:38:25 2017 -0400
Committer: Robert Levas <rlevas@hortonworks.com>
Committed: Wed Jul 19 08:38:25 2017 -0400

----------------------------------------------------------------------
 .../controllers/groups/GroupsEditCtrl.js        |   3 +
 .../stackVersions/StackVersionsCreateCtrl.js    |   3 +-
 .../libraries/functions/get_stack_version.py    |   4 +-
 ambari-infra/ambari-infra-solr-client/build.xml |   1 +
 ambari-infra/ambari-infra-solr-client/pom.xml   |  10 +
 .../src/main/resources/solrIndexHelper.sh       | 156 ++++
 .../kafka/KafkaTimelineMetricsReporter.java     |   6 +-
 ambari-server/pom.xml                           |   2 +-
 ambari-server/sbin/ambari-server                |   6 +-
 .../org/apache/ambari/server/agent/hello.rs     |   0
 .../AmbariCustomCommandExecutionHelper.java     |  21 +-
 .../AmbariManagementControllerImpl.java         | 124 ++-
 .../BlueprintConfigurationProcessor.java        |  64 +-
 .../internal/ClientConfigResourceProvider.java  |   3 +-
 .../internal/HostResourceProvider.java          |   1 +
 .../server/controller/internal/Stack.java       |   2 +-
 .../server/controller/internal/UnitUpdater.java | 150 ++++
 .../LdapToPamMigrationHelper.java               |  73 ++
 .../ambari/server/state/ConfigHelper.java       |  17 +
 .../ambari/server/state/PropertyInfo.java       |   2 +
 .../KerberosDescriptorUpdateHelper.java         |   9 +-
 .../validators/TopologyValidatorFactory.java    |   2 +-
 .../validators/UnitValidatedProperty.java       |  95 +++
 .../topology/validators/UnitValidator.java      |  79 ++
 ambari-server/src/main/python/ambari-server.py  |  14 +-
 .../main/python/ambari_server/setupActions.py   |   1 +
 .../main/python/ambari_server/setupSecurity.py  | 119 ++-
 .../HDFS/2.1.0.2.0/configuration/hdfs-site.xml  |   6 +
 .../HDFS/2.1.0.2.0/package/scripts/hdfs.py      |   8 +
 .../2.1.0.2.0/package/scripts/hdfs_namenode.py  |  25 +-
 .../HDFS/2.1.0.2.0/package/scripts/namenode.py  |   4 +
 .../2.1.0.2.0/package/scripts/params_linux.py   |   9 +-
 .../2.1.0.2.0/package/scripts/params_windows.py |   7 +
 .../package/templates/include_hosts_list.j2     |  21 +
 .../HDFS/3.0.0.3.0/package/scripts/hdfs.py      |   8 +
 .../3.0.0.3.0/package/scripts/hdfs_namenode.py  |  17 +-
 .../3.0.0.3.0/package/scripts/params_linux.py   |   8 +-
 .../3.0.0.3.0/package/scripts/params_windows.py |   7 +
 .../package/templates/include_hosts_list.j2     |  21 +
 .../KAFKA/0.10.0.3.0/metainfo.xml               |   1 +
 .../KAFKA/0.10.0.3.0/package/scripts/kafka.py   |  10 +
 .../KAFKA/0.10.0.3.0/package/scripts/params.py  |   3 +
 .../common-services/KAFKA/0.10.0/metainfo.xml   |   1 +
 .../KAFKA/0.8.1/package/scripts/kafka.py        |  12 +
 .../KAFKA/0.8.1/package/scripts/params.py       |   3 +
 .../KAFKA/0.9.0/configuration/kafka-broker.xml  |   2 +-
 .../YARN/2.1.0.2.0/configuration/yarn-site.xml  |   6 +
 .../2.1.0.2.0/package/scripts/params_linux.py   |  12 +-
 .../2.1.0.2.0/package/scripts/params_windows.py |  10 +-
 .../package/scripts/resourcemanager.py          |  18 +-
 .../YARN/2.1.0.2.0/package/scripts/service.py   |   4 +
 .../package/templates/include_hosts_list.j2     |  21 +
 .../YARN/3.0.0.3.0/configuration/yarn-site.xml  |   6 +
 .../3.0.0.3.0/package/scripts/params_linux.py   |  11 +-
 .../3.0.0.3.0/package/scripts/params_windows.py |  10 +-
 .../package/scripts/resourcemanager.py          |  18 +-
 .../package/templates/include_hosts_list.j2     |  21 +
 .../YARN/3.0.0.3.0/service_advisor.py           |   7 +-
 .../0.6.0.2.5/package/scripts/master.py         |   1 +
 .../services/HDFS/configuration/hdfs-site.xml   |   6 +
 .../HDFS/package/scripts/hdfs_namenode.py       |  12 +-
 .../0.8/services/HDFS/package/scripts/params.py |  11 +-
 .../package/templates/include_hosts_list.j2     |  21 +
 .../services/YARN/configuration/yarn-site.xml   |   6 +
 .../0.8/services/YARN/package/scripts/params.py |  10 +-
 .../YARN/package/scripts/resourcemanager.py     |   9 +-
 .../package/templates/include_hosts_list.j2     |  21 +
 .../services/YARN/configuration/yarn-site.xml   |   6 +
 .../services/YARN/package/scripts/params.py     |   9 +-
 .../YARN/package/scripts/resourcemanager.py     |   9 +-
 .../package/templates/exclude_hosts_list.j2     |  21 +
 .../package/templates/include_hosts_list.j2     |  21 +
 .../hooks/before-ANY/files/changeToSecureUid.sh |  13 +-
 .../before-ANY/scripts/shared_initialization.py |  45 +-
 .../services/YARN/configuration/yarn-site.xml   |   6 +
 .../services/YARN/package/scripts/params.py     |  10 +-
 .../YARN/package/scripts/resourcemanager.py     |   9 +-
 .../package/templates/include_hosts_list.j2     |  21 +
 .../stacks/HDP/2.5/services/stack_advisor.py    |  13 +-
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml  |   4 +
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml |   6 +-
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml     |   1 +
 .../configuration/application-properties.xml    |  17 +
 .../stacks/HDP/2.6/services/HIVE/kerberos.json  | 151 ----
 .../stacks/HDP/2.6/services/YARN/kerberos.json  |   2 +-
 .../stacks/HDP/2.6/upgrades/config-upgrade.xml  |   4 +
 .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml |   4 +
 .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml     |   1 +
 .../HDP/3.0/configuration/cluster-env.xml       |   4 +-
 .../HDP/3.0/properties/stack_features.json      | 752 ++++++++++---------
 .../stacks/HDP/3.0/properties/stack_tools.json  |  14 +-
 .../src/main/resources/stacks/stack_advisor.py  |   7 +-
 .../AmbariManagementControllerImplTest.java     |  12 +-
 .../AmbariManagementControllerTest.java         |   8 +-
 .../controller/internal/UnitUpdaterTest.java    | 114 +++
 .../ambari/server/state/ConfigHelperTest.java   |  22 +
 .../KerberosDescriptorUpdateHelperTest.java     |  70 ++
 .../topology/validators/UnitValidatorTest.java  | 114 +++
 .../python/stacks/2.0.6/HDFS/test_namenode.py   |   2 +-
 .../stacks/2.0.6/configs/altfs_plus_hdfs.json   |   2 +-
 .../python/stacks/2.0.6/configs/default.json    |   2 +-
 .../2.0.6/configs/default_ams_embedded.json     |   2 +-
 .../2.0.6/configs/default_hive_nn_ha.json       |   2 +-
 .../2.0.6/configs/default_hive_nn_ha_2.json     |   2 +-
 .../2.0.6/configs/default_hive_non_hdfs.json    |   2 +-
 .../2.0.6/configs/default_no_install.json       |   2 +-
 .../2.0.6/configs/default_oozie_mysql.json      |   2 +-
 .../default_update_exclude_file_only.json       |   2 +-
 .../2.0.6/configs/default_with_bucket.json      |   2 +-
 .../python/stacks/2.0.6/configs/flume_22.json   |   2 +-
 .../python/stacks/2.0.6/configs/flume_only.json |   2 +-
 .../stacks/2.0.6/configs/hbase_no_phx.json      |   2 +-
 .../stacks/2.0.6/configs/hbase_with_phx.json    |   2 +-
 .../2.0.6/configs/oozie_existing_sqla.json      |   2 +-
 .../stacks/2.0.6/configs/repository_file.json   |   2 +-
 .../python/stacks/2.0.6/configs/secured.json    |   2 +-
 .../2.0.6/hooks/before-ANY/test_before_any.py   | 294 +++++---
 .../test/python/stacks/2.3/configs/ats_1_5.json |   2 +-
 .../stacks/2.5/common/test_stack_advisor.py     |   4 +-
 .../python/stacks/2.5/configs/hsi_default.json  |   2 +-
 .../2.5/configs/hsi_default_for_restart.json    |   2 +-
 .../test/python/stacks/2.5/configs/hsi_ha.json  |   2 +-
 .../app/controllers/wizard/step7_controller.js  |  67 ++
 .../configs/stack_config_properties_mapper.js   |  14 +-
 ambari-web/app/styles/application.less          |  15 +
 ...ontrols_service_config_usergroup_with_id.hbs |  27 +
 ambari-web/app/utils/ajax/ajax.js               |   2 +-
 ambari-web/app/utils/config.js                  |   3 +
 .../configs/service_configs_by_category_view.js |   6 +
 ambari-web/app/views/common/controls_view.js    |  39 +
 .../services/YARN/configuration/yarn-site.xml   |   6 +
 .../YARN/package/scripts/params_linux.py        |   9 +-
 .../YARN/package/scripts/params_windows.py      |  10 +-
 .../YARN/package/scripts/resourcemanager.py     |  18 +-
 .../package/templates/include_hosts_list.j2     |  21 +
 135 files changed, 2590 insertions(+), 860 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/903cd1a0/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/903cd1a0/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
----------------------------------------------------------------------


Mime
View raw message