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/4f75eced Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4f75eced Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4f75eced Branch: refs/heads/branch-feature-AMBARI-20859 Commit: 4f75eced9c3f6cba8fe388c934cb15d575af0c90 Parents: 6484948 b1fd131 Author: Robert Levas <rle...@hortonworks.com> Authored: Fri Dec 8 14:22:07 2017 -0500 Committer: Robert Levas <rle...@hortonworks.com> Committed: Fri Dec 8 14:22:07 2017 -0500 ---------------------------------------------------------------------- .../core/providers/package/yumrpm.py | 13 +- .../libraries/providers/hdfs_resource.py | 2 + .../ambari-logsearch-web/package.json | 3 +- .../ambari-logsearch-web/src/app/app.module.ts | 8 +- .../src/app/classes/filtering.ts | 2 +- .../src/app/classes/histogram-options.ts | 3 +- .../dropdown-list/dropdown-list.component.less | 24 +- .../filters-panel/filters-panel.component.html | 5 +- .../filters-panel/filters-panel.component.ts | 23 +- .../logs-container.component.html | 2 +- .../logs-container.component.less | 5 +- .../src/app/components/mixins.less | 35 +- .../search-box/search-box.component.html | 28 +- .../search-box/search-box.component.less | 30 +- .../search-box/search-box.component.spec.ts | 79 ++++ .../search-box/search-box.component.ts | 214 ++++++----- .../time-histogram.component.html | 29 ++ .../time-histogram.component.less | 162 +++++++- .../time-histogram.component.spec.ts | 138 ++++++- .../time-histogram/time-histogram.component.ts | 377 ++++++++++++++++--- .../app/services/component-actions.service.ts | 9 +- .../src/app/services/logs-container.service.ts | 26 +- .../src/assets/i18n/en.json | 13 +- ambari-logsearch/ambari-logsearch-web/yarn.lock | 6 +- ambari-logsearch/docker/all.yml | 2 +- .../AmbariManagementControllerImpl.java | 6 + .../ambari/server/controller/AmbariServer.java | 6 + .../upgrade/HostVersionOutOfSyncListener.java | 24 ++ .../2.0.0.3.0/package/scripts/status_params.py | 2 +- .../HIVE/0.12.0.2.0/package/scripts/hive.py | 10 +- .../0.12.0.2.0/package/scripts/params_linux.py | 2 + .../HIVE/2.1.0.3.0/package/scripts/hive.py | 10 +- .../2.1.0.3.0/package/scripts/params_linux.py | 1 + .../1.10.3-10/configuration/kerberos-env.xml | 1 + .../1.10.3-30/configuration/kerberos-env.xml | 1 + .../configuration-mapred/mapred-site.xml | 2 +- .../configuration-mapred/mapred-site.xml | 2 +- .../ZEPPELIN/0.7.0/package/scripts/master.py | 2 +- .../stacks/HDP/2.6/upgrades/config-upgrade.xml | 2 +- .../KERBEROS/configuration/kerberos-env.xml | 1 + ambari-web/app/controllers/main/service/item.js | 4 +- ambari-web/app/models/repository.js | 3 +- ambari-web/app/styles/application.less | 7 +- .../common/configs/service_config_wizard.hbs | 8 +- .../app/templates/main/host/configs_service.hbs | 2 +- .../app/templates/main/service/info/configs.hbs | 2 +- .../upgrade_version_column_view.js | 11 +- 47 files changed, 1028 insertions(+), 319 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/4f75eced/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/4f75eced/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java ----------------------------------------------------------------------
