ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rle...@apache.org
Subject [29/29] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-20859
Date Fri, 01 Dec 2017 21:41:05 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/b6cf4325
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b6cf4325
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b6cf4325

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: b6cf4325ef29a7928131d415432c9bb7271621d5
Parents: 44ed90e 959ad90
Author: Robert Levas <rlevas@hortonworks.com>
Authored: Fri Dec 1 16:40:26 2017 -0500
Committer: Robert Levas <rlevas@hortonworks.com>
Committed: Fri Dec 1 16:40:26 2017 -0500

----------------------------------------------------------------------
 .../resources/ui/admin-web/app/scripts/app.js   |   2 +-
 .../stackVersions/StackVersionsCreateCtrl.js    |  28 +-
 .../stackVersions/StackVersionsEditCtrl.js      |   2 +-
 .../ui/admin-web/app/scripts/services/Stack.js  |   3 +-
 .../ui/admin-web/app/styles/toggle-switch.css   |  72 +++
 .../app/views/ambariViews/modals/create.html    |   3 +-
 .../app/views/authentication/main.html          |   6 +-
 .../views/loginActivities/homeDirectory.html    |   6 +-
 .../app/views/loginActivities/loginMessage.html |   6 +-
 .../userManagement/modals/groupCreate.html      |   3 +-
 .../views/userManagement/modals/userCreate.html |  11 +-
 .../app/views/userManagement/userEdit.html      |  12 +-
 .../src/main/resources/ui/admin-web/bower.json  |  11 +-
 .../main/resources/ui/admin-web/package.json    |   2 +-
 .../core/providers/package/__init__.py          |  15 +
 .../core/providers/package/yumrpm.py            | 108 ++++
 .../libraries/functions/constants.py            |  12 +-
 .../libraries/functions/lzo_utils.py            |   6 +-
 .../action-menu/action-menu.component.less      |   3 -
 .../action-menu/action-menu.component.ts        |   4 -
 .../audit-logs-table.component.html             |   8 +-
 .../dropdown-button.component.html              |   4 +-
 .../dropdown-button.component.less              |  17 +-
 .../dropdown-button.component.ts                |   3 +
 .../filters-panel/filters-panel.component.html  |  14 +-
 .../filters-panel/filters-panel.component.less  |  11 +-
 .../filters-panel/filters-panel.component.ts    |  21 +-
 .../menu-button/menu-button.component.less      |  13 +-
 .../src/app/components/mixins.less              |  17 +
 .../pagination/pagination.component.html        |   4 +-
 .../search-box/search-box.component.html        |   2 +-
 .../search-box/search-box.component.less        |  18 +-
 .../search-box/search-box.component.ts          |  38 +-
 .../service-logs-table.component.html           |   7 +-
 .../service-logs-table.component.less           |   1 -
 .../components/top-menu/top-menu.component.html |   7 +-
 .../components/top-menu/top-menu.component.less |   4 +
 .../top-menu/top-menu.component.spec.ts         |  64 +-
 .../components/top-menu/top-menu.component.ts   |  25 +-
 .../src/app/components/variables.less           |   3 +-
 .../src/app/services/logs-container.service.ts  |  11 +-
 .../src/assets/i18n/en.json                     |   2 +-
 .../ambari-logsearch-web/webpack.config.js      |  20 +-
 .../ambari-metrics-hadoop-sink/pom.xml          |   4 +-
 .../actionmanager/ExecutionCommandWrapper.java  |   5 +
 .../server/api/handlers/CreateHandler.java      |   8 +-
 .../server/api/handlers/UpdateHandler.java      |   8 +-
 .../resources/ResourceInstanceFactoryImpl.java  |   4 +-
 ...ootServiceComponentConfigurationService.java |  15 +
 .../api/services/ldap/AmbariConfiguration.java  |  46 --
 .../api/services/ldap/LdapConfigOperation.java  |  43 --
 .../services/ldap/LdapConfigurationRequest.java |  49 --
 .../services/ldap/LdapConfigurationService.java | 185 ------
 .../api/services/ldap/LdapRequestInfo.java      |  61 --
 .../services/serializers/JsonSerializer.java    |  38 +-
 .../commands/StackAdvisorCommand.java           |  14 +-
 .../AmbariManagementControllerImpl.java         |  80 +--
 .../server/controller/RepositoryRequest.java    |  22 +-
 .../AmbariServerConfigurationCategory.java      |  69 ++
 .../AmbariServerConfigurationHandler.java       | 110 ++++
 .../AmbariServerLDAPConfigurationHandler.java   | 172 +++++
 .../internal/HostResourceProvider.java          |  54 +-
 .../internal/OperationStatusMetaData.java       |  90 +++
 .../internal/RepositoryResourceProvider.java    |   3 +-
 ...ootServiceComponentConfigurationHandler.java | 114 ++++
 ...iceComponentConfigurationHandlerFactory.java |  54 ++
 ...eComponentConfigurationResourceProvider.java | 243 +++----
 .../apache/ambari/server/ldap/LdapModule.java   |   4 -
 .../ldap/domain/AmbariLdapConfigKeys.java       |  83 ---
 .../ldap/domain/AmbariLdapConfiguration.java    |  85 +--
 .../domain/AmbariLdapConfigurationFactory.java  |  34 -
 .../domain/AmbariLdapConfigurationKeys.java     |  83 +++
 .../AmbariLdapConfigurationProvider.java        |  19 +-
 .../server/ldap/service/AmbariLdapFacade.java   |   4 +-
 .../ambari/server/ldap/service/LdapFacade.java  |   9 +-
 .../DefaultLdapAttributeDetectionService.java   |   8 +-
 .../ads/DefaultLdapConfigurationService.java    |   4 +-
 .../ads/detectors/GroupMemberAttrDetector.java  |   4 +-
 .../ads/detectors/GroupNameAttrDetector.java    |   7 +-
 .../ads/detectors/GroupObjectClassDetector.java |   8 +-
 .../detectors/UserGroupMemberAttrDetector.java  |   5 +-
 .../ads/detectors/UserNameAttrDetector.java     |   4 +-
 .../ads/detectors/UserObjectClassDetector.java  |   4 +-
 .../server/upgrade/UpgradeCatalog260.java       |   4 +
 .../python/ambari_server/serverConfiguration.py |  17 +-
 .../main/python/ambari_server/serverSetup.py    |   5 +-
 .../main/python/ambari_server/serverUpgrade.py  |  14 +-
 .../KAFKA/0.10.0/configuration/kafka-broker.xml |  39 ++
 .../configuration/kafka_client_jaas_conf.xml    |  43 ++
 .../0.10.0/configuration/kafka_jaas_conf.xml    | 116 ++++
 .../KAFKA/0.8.1/configuration/kafka-env.xml     |   2 +-
 .../KAFKA/0.8.1/package/scripts/kafka.py        |   4 +-
 .../KAFKA/0.8.1/package/scripts/params.py       |  16 +-
 .../0.8.1/package/scripts/service_check.py      |  15 +-
 .../0.8.1/package/scripts/setup_ranger_kafka.py |   8 +-
 .../KAFKA/0.8.1/package/scripts/upgrade.py      |   3 +-
 .../package/templates/kafka_client_jaas.conf.j2 |   3 +
 .../0.8.1/package/templates/kafka_jaas.conf.j2  |  47 ++
 .../KAFKA/0.9.0/configuration/kafka-broker.xml  |   2 +-
 .../package/scripts/oozie_server_upgrade.py     |  24 +-
 .../package/scripts/oozie_server_upgrade.py     |  50 +-
 .../common-services/SPARK/1.2.1/alerts.json     |   2 +-
 .../common-services/SPARK2/2.0.0/alerts.json    |   2 +-
 .../custom_actions/scripts/install_packages.py  |  12 +-
 .../HDP/2.0.6/properties/stack_features.json    |  11 +
 .../stacks/HDP/2.0.6/services/stack_advisor.py  |   2 +-
 .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml |   2 +-
 .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml     |   2 +-
 .../HDP/3.0/properties/stack_features.json      |   6 +
 .../ExecutionCommandWrapperTest.java            |  15 +-
 .../commands/StackAdvisorCommandTest.java       |   4 +-
 .../AmbariManagementControllerImplTest.java     |  53 +-
 .../AmbariManagementControllerTest.java         |  49 +-
 .../internal/HostResourceProviderTest.java      |   6 +-
 ...ponentConfigurationResourceProviderTest.java | 214 +++++--
 .../server/ldap/LdapModuleFunctionalTest.java   |  49 +-
 .../TestAmbariLdapConfigurationFactory.java     |  29 -
 .../ldap/service/AmbariLdapFacadeTest.java      |  36 +-
 ...efaultLdapAttributeDetectionServiceTest.java |  24 +-
 .../DefaultLdapConfigurationServiceTest.java    |  31 +-
 .../server/upgrade/UpgradeCatalog260Test.java   |   4 +
 .../stacks/2.0.6/OOZIE/test_oozie_server.py     |  24 +-
 .../stacks/2.0.6/common/test_stack_advisor.py   |   4 +-
 .../2.6/KAFKA/test_kafka_broker_other_sasl.py   |  97 +++
 .../2.6/configs/default_kafka_plaintext.json    | 631 +++++++++++++++++++
 .../configs/default_kafka_plaintextsasl.json    | 631 +++++++++++++++++++
 .../configs/default_kafka_sasl_plaintext.json   | 631 +++++++++++++++++++
 .../2.6/configs/default_kafka_sasl_ssl.json     | 631 +++++++++++++++++++
 ambari-web/app/controllers/installer.js         |   5 +-
 .../resources/ui/app/components/upload-file.js  |  38 +-
 130 files changed, 4839 insertions(+), 1303 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/b6cf4325/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/b6cf4325/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
----------------------------------------------------------------------
diff --cc ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index 13b0925,232737c..a255474
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@@ -139,8 -139,8 +139,7 @@@ import org.apache.ambari.server.securit
  import org.apache.ambari.server.security.authorization.ResourceType;
  import org.apache.ambari.server.security.authorization.RoleAuthorization;
  import org.apache.ambari.server.security.authorization.User;
 -import org.apache.ambari.server.security.authorization.UserType;
  import org.apache.ambari.server.security.authorization.Users;
- import org.apache.ambari.server.security.credential.PrincipalKeyCredential;
  import org.apache.ambari.server.security.encryption.CredentialStoreService;
  import org.apache.ambari.server.security.encryption.CredentialStoreType;
  import org.apache.ambari.server.security.ldap.AmbariLdapDataPopulator;

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


Mime
View raw message