You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2017/10/19 20:10:35 UTC
[12/12] ambari git commit: Merge branch 'trunk' into
branch-feature-AMBARI-20859
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/d57ebbc2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d57ebbc2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d57ebbc2
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: d57ebbc2d28ad2b9ff1697125426798d7fb7a624
Parents: 06676d6 e76b563
Author: Robert Levas <rl...@hortonworks.com>
Authored: Thu Oct 19 16:10:14 2017 -0400
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Thu Oct 19 16:10:14 2017 -0400
----------------------------------------------------------------------
.../ui/admin-web/app/scripts/i18n.config.js | 2 +-
.../ambari-logsearch-web/src/app/app.module.ts | 4 +
.../src/app/classes/filtering.ts | 369 +++++++++++++++++++
.../src/app/classes/models/app-state.ts | 14 +-
.../src/app/classes/models/store.ts | 12 +-
.../src/app/classes/models/tab.ts | 53 +++
.../collapsible-panel.component.spec.ts | 14 +-
.../dropdown-button.component.spec.ts | 18 +-
.../dropdown-list.component.spec.ts | 7 +-
.../filter-button.component.spec.ts | 18 +-
.../filter-dropdown.component.spec.ts | 18 +-
.../filters-panel/filters-panel.component.html | 17 +-
.../filters-panel.component.spec.ts | 5 +-
.../filters-panel/filters-panel.component.ts | 44 ++-
.../log-context/log-context.component.spec.ts | 5 +-
.../logs-container.component.html | 17 +-
.../logs-container.component.less | 7 +-
.../logs-container.component.spec.ts | 11 +-
.../logs-container/logs-container.component.ts | 108 +++---
.../logs-list/logs-list.component.html | 24 +-
.../components/logs-list/logs-list.component.ts | 25 +-
.../main-container.component.html | 10 +-
.../main-container.component.less | 4 -
.../main-container.component.spec.ts | 15 +-
.../main-container/main-container.component.ts | 51 +--
.../menu-button/menu-button.component.spec.ts | 18 +-
.../pagination/pagination.component.html | 2 +-
.../pagination/pagination.component.ts | 6 +-
.../src/app/components/tabs/tabs.component.html | 25 ++
.../src/app/components/tabs/tabs.component.less | 22 ++
.../app/components/tabs/tabs.component.spec.ts | 125 +++++++
.../src/app/components/tabs/tabs.component.ts | 48 +++
.../time-histogram.component.less | 1 +
.../time-range-picker.component.spec.ts | 13 +-
.../time-range-picker.component.ts | 4 +-
.../timezone-picker.component.spec.ts | 18 +-
.../services/component-actions.service.spec.ts | 5 +-
.../app/services/component-actions.service.ts | 33 +-
.../component-generator.service.spec.ts | 7 +-
.../src/app/services/filtering.service.spec.ts | 3 +
.../src/app/services/filtering.service.ts | 341 +----------------
.../app/services/logs-container.service.spec.ts | 5 +-
.../src/app/services/logs-container.service.ts | 60 ++-
.../app/services/storage/reducers.service.ts | 4 +-
.../src/app/services/storage/tabs.service.ts | 33 ++
.../src/assets/i18n/en.json | 2 +
.../ambari/server/orm/DBAccessorImpl.java | 8 +-
.../orm/entities/RepositoryVersionEntity.java | 5 +-
.../orm/entities/ServiceDesiredStateEntity.java | 6 +-
.../server/upgrade/UpgradeCatalog260.java | 6 +
.../YARN/3.0.0.3.0/service_advisor.py | 3 +-
.../HDP/2.0.6/properties/stack_packages.json | 3 +-
.../stacks/HDP/2.3/upgrades/config-upgrade.xml | 5 +
.../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 3 +
.../stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 1 +
.../stacks/HDP/2.4/upgrades/config-upgrade.xml | 4 +
.../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 3 +
.../stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 1 +
.../stacks/HDP/2.5/upgrades/config-upgrade.xml | 10 +
.../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 3 +
.../stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 1 +
.../services/STORM/configuration/storm-site.xml | 6 +-
.../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 +
ambari-web/app/app.js | 24 +-
.../models/configs/service_config_version.js | 9 +-
ambari-web/app/models/host_stack_version.js | 4 +-
.../common/configs/config_history_flow.hbs | 8 +-
.../common/configs/service_version_box.hbs | 8 +-
.../templates/common/host_progress_popup.hbs | 6 +-
.../modal_popups/widget_browser_popup.hbs | 6 +-
ambari-web/app/templates/experimental.hbs | 6 +-
.../main/admin/stack_upgrade/versions.hbs | 6 +-
ambari-web/app/templates/main/host.hbs | 4 +-
.../templates/main/host/bulk_operation_menu.hbs | 4 +-
.../main/host/details/host_component.hbs | 176 ++++-----
.../app/templates/main/host/stack_versions.hbs | 4 +-
ambari-web/app/templates/main/host/summary.hbs | 120 +++---
ambari-web/app/utils/helper.js | 23 ++
ambari-web/app/views/main/service/item.js | 2 +-
ambari-web/test/views/main/service/item_test.js | 6 +-
docs/pom.xml | 12 +
83 files changed, 1380 insertions(+), 772 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d57ebbc2/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
----------------------------------------------------------------------