You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2017/04/27 20:20:04 UTC
[17/50] [abbrv] ambari git commit: Merge branch 'trunk' into
branch-dev-patch-upgrade
Merge branch 'trunk' into branch-dev-patch-upgrade
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7a87817b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7a87817b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7a87817b
Branch: refs/heads/trunk
Commit: 7a87817b8cd4730e2b648bb42e2e2a1b1661c775
Parents: e7399fe 95e9804
Author: Nate Cole <nc...@hortonworks.com>
Authored: Tue Dec 20 09:34:42 2016 -0500
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Tue Dec 20 09:34:42 2016 -0500
----------------------------------------------------------------------
.../src/main/python/ambari_agent/ActionQueue.py | 13 +
.../src/main/python/ambari_agent/main.py | 8 +
.../test/python/ambari_agent/TestActionQueue.py | 61 +++
.../conf/unix/ambari-metrics-monitor | 9 +-
.../src/main/python/core/host_info.py | 2 +-
.../kerberos/DestroyPrincipalsServerAction.java | 11 +-
.../quicklinksprofile/AcceptAllFilter.java | 46 ++
.../state/quicklinksprofile/Component.java | 57 +++
.../server/state/quicklinksprofile/Filter.java | 78 ++++
.../state/quicklinksprofile/LinkNameFilter.java | 61 +++
.../state/quicklinksprofile/PropertyFilter.java | 60 +++
.../quicklinksprofile/QuickLinksProfile.java | 70 ++++
.../QuickLinksProfileParser.java | 108 +++++
.../server/state/quicklinksprofile/Service.java | 72 ++++
.../ambari/server/utils/ShellCommandUtil.java | 41 +-
.../DRUID/0.9.2/configuration/druid-env.xml | 1 +
.../DRUID/0.9.2/package/scripts/druid.py | 37 --
.../0.12.0.2.0/package/scripts/params_linux.py | 7 +-
.../0.6.0.2.5/package/scripts/master.py | 1 -
.../src/main/resources/stacks/stack_advisor.py | 19 +-
.../QuickLinksConfigurationModuleTest.java | 2 -
.../QuickLinksProfileParserTest.java | 70 ++++
.../server/utils/TestShellCommandUtil.java | 35 ++
.../stacks/2.2/common/test_stack_advisor.py | 53 +++
.../test/python/stacks/2.6/DRUID/test_druid.py | 24 --
.../resources/example_quicklinks_profile.json | 48 +++
.../inconsistent_quicklinks_profile.json | 10 +
ambari-web/app/controllers/main/host/details.js | 418 ++++++++++---------
ambari-web/app/messages.js | 7 -
.../main/host/details/actions/check_host.js | 3 +-
.../templates/common/configs/service_config.hbs | 2 +-
.../main/host/details/addComponentPopup.hbs | 19 -
.../details/addComponentWithConfigsChanges.hbs | 27 --
.../host/details/addDeleteComponentPopup.hbs | 40 ++
.../main/host/details/deleteComponentPopup.hbs | 45 --
ambari-web/app/utils/ajax/ajax.js | 13 +-
ambari-web/app/views/main/host/summary.js | 4 -
.../test/controllers/main/host/details_test.js | 223 +++-------
.../test/controllers/wizard/step3_test.js | 6 +-
contrib/views/slider/pom.xml | 6 +
.../ui/app/components/bundle-config.js | 3 +
.../resources/ui/app/components/coord-config.js | 3 +
.../ui/app/components/flow-designer.js | 3 +
.../ui/app/components/preview-dialog.js | 12 +-
.../app/templates/components/bundle-config.hbs | 4 +-
.../app/templates/components/coord-config.hbs | 4 +-
.../app/templates/components/flow-designer.hbs | 4 +-
47 files changed, 1286 insertions(+), 564 deletions(-)
----------------------------------------------------------------------