This is an automated email from the ASF dual-hosted git repository.

jonathanhurley pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit 157131a7972a70e2956aadec372b573e1ba739fc
Merge: aced8a2 d374ab6
Author: Jonathan Hurley <[email protected]>
AuthorDate: Thu Aug 30 15:18:22 2018 -0400

    Merge branch 'trunk' into branch-feature-AMBARI-14714

 .../main/python/ambari_agent/PingPortListener.py   |   5 +-
 .../src/main/python/ambari_agent/PythonExecutor.py |   6 +-
 .../resource_management/TestRepositoryResource.py  |  45 +--
 .../ambari_commons/repo_manager/apt_manager.py     |   2 +-
 .../libraries/functions/repository_util.py         |  10 +-
 .../libraries/providers/__init__.py                |   6 +-
 .../libraries/providers/repository.py              | 139 ++++----
 .../libraries/resources/repository.py              |   9 +-
 ambari-infra/pom.xml                               |  22 ++
 .../log-index-filter.component.html                |   2 +-
 .../log-index-filter.component.spec.ts             |   4 +-
 .../log-index-filter/log-index-filter.component.ts |   4 +-
 .../dropdown-button/dropdown-button.component.less |   1 -
 .../dropdown-list/dropdown-list.component.ts       |  17 +-
 .../ambari-logsearch-web/src/styles.less           |   7 +
 ambari-logsearch/pom.xml                           |  22 ++
 ambari-metrics/ambari-metrics-assembly/pom.xml     |  25 --
 .../src/main/assembly/sink-windows.xml             |   8 -
 .../src/main/assembly/sink.xml                     |   9 -
 .../ambari-metrics-storm-sink-legacy/pom.xml       | 207 -----------
 .../src/main/assemblies/empty.xml                  |  21 --
 .../sink/storm/StormTimelineMetricsReporter.java   | 238 -------------
 .../sink/storm/StormTimelineMetricsSink.java       | 332 ------------------
 .../sink/storm/StormTimelineMetricsSinkTest.java   | 134 -------
 ambari-metrics/pom.xml                             |   1 -
 .../ambari/server/api/AmbariErrorHandler.java      |   2 +-
 .../AmbariServerConfigurationKey.java              |   3 +-
 .../internal/ClientConfigResourceProvider.java     |   6 +-
 .../state/HDFSServiceCalculatedState.java          |  43 ++-
 .../ldap/domain/AmbariLdapConfiguration.java       |   5 +
 .../authorization/LdapServerProperties.java        |   9 +
 .../security/ldap/AmbariLdapDataPopulator.java     |  16 +-
 .../ambari/server/upgrade/SchemaUpgradeHelper.java |   1 -
 .../ambari/server/upgrade/UpgradeCatalog271.java   | 384 ---------------------
 ambari-server/src/main/python/ambari-server.py     |  44 +--
 .../src/main/python/ambari_server/setupSecurity.py | 196 +++++++----
 .../custom_actions/scripts/update_repo.py          |   3 +-
 .../before-INSTALL/scripts/repo_initialization.py  |   4 +-
 .../internal/AlertTargetResourceProviderTest.java  |  18 +-
 .../internal/ClientConfigResourceProviderTest.java | 140 ++++++--
 .../state/HDFSServiceCalculatedStateTest.java      |  85 +++++
 .../server/security/TestAuthenticationFactory.java | 219 ++++++------
 .../server/upgrade/UpgradeCatalog271Test.java      | 360 -------------------
 .../ambari/server/upgrade/UpgradeCatalogTest.java  |   8 +-
 ambari-server/src/test/python/TestAmbariServer.py  | 126 ++++++-
 .../test/python/custom_actions/TestUpdateRepo.py   |   4 +-
 .../before-INSTALL/test_before_install.py          |  23 +-
 .../common/configs/config_recommendation_parser.js |  11 +-
 .../app/mixins/common/configs/enhanced_configs.js  |  15 +-
 ambari-web/app/router.js                           |   2 +-
 ambari-web/app/styles/theme/bootstrap-ambari.css   |  69 ++++
 ambari-web/app/views/common/controls_view.js       |   2 +
 ambari-web/test/controllers/wizard/step7_test.js   | 317 +++++++++++++++++
 .../configs/config_recommendation_parser_test.js   |   2 +
 ambari-web/test/router_test.js                     |  20 ++
 .../ONEFS/1.0.0/configuration/hdfs-site.xml        |  12 -
 .../ONEFS/1.0.0/quicklinks/quicklinks.json         |  17 +-
 docs/pom.xml                                       |   2 +-
 docs/src/site/apt/index.apt                        |   2 +-
 docs/src/site/apt/whats-new.apt                    |  15 +-
 docs/src/site/site.xml                             |   2 +
 61 files changed, 1314 insertions(+), 2149 deletions(-)

Reply via email to