ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [23/24] ambari git commit: Merge branch 'branch-2.6' into branch-feature-AMBARI-22457
Date Tue, 28 Nov 2017 21:20:42 GMT
Merge branch 'branch-2.6' into branch-feature-AMBARI-22457


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ed50bc38
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ed50bc38
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ed50bc38

Branch: refs/heads/branch-2.6
Commit: ed50bc3830e63e01961cbc03ef6d7c611c243c1c
Parents: 3a0ae86 754b1f6
Author: Jonathan Hurley <jhurley@hortonworks.com>
Authored: Tue Nov 28 15:39:47 2017 -0500
Committer: Jonathan Hurley <jhurley@hortonworks.com>
Committed: Tue Nov 28 15:39:47 2017 -0500

----------------------------------------------------------------------
 .../libraries/functions/component_version.py    |  9 +-
 .../ambari/logfeeder/filter/FilterKeyValue.java |  4 +-
 .../configsets/hadoop_logs/conf/managed-schema  |  3 +
 .../model/response/ServiceLogData.java          |  2 +
 .../ambari/logsearch/solr/SolrConstants.java    |  1 +
 .../solr/model/SolrServiceLogData.java          | 17 ++++
 .../actionmanager/ExecutionCommandWrapper.java  |  1 -
 .../internal/UpgradeResourceProvider.java       | 38 --------
 .../dispatchers/AmbariSNMPDispatcher.java       | 11 ++-
 .../2.1.0.2.0/package/scripts/params_linux.py   |  6 ++
 .../custom_actions/scripts/ru_execute_tasks.py  |  5 +-
 .../4.0/properties/stack_packages.json          |  6 ++
 .../HDFS/package/scripts/namenode_upgrade.py    |  8 +-
 .../4.0/stack-advisor/stack_advisor_25.py       |  2 +-
 .../HDP/2.0.6/properties/stack_packages.json    |  2 +-
 .../services/YARN/configuration/yarn-site.xml   |  4 +-
 .../stacks/HDP/2.5/services/stack_advisor.py    |  2 +-
 .../stacks/HDP/2.6/services/OOZIE/metainfo.xml  | 34 +++++++
 .../stacks/HDP/2.6/services/stack_advisor.py    |  3 +
 .../stacks/HDP/2.6/upgrades/config-upgrade.xml  | 14 ++-
 .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 11 ++-
 .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml     |  4 +
 .../dispatchers/AmbariSNMPDispatcherTest.java   | 97 +++++++++++---------
 .../AlertNoticeDispatchServiceTest.java         | 63 ++++++++++---
 .../custom_actions/test_ru_execute_tasks.py     |  6 +-
 .../stacks/2.5/common/test_stack_advisor.py     |  2 +-
 .../stacks/2.6/common/test_stack_advisor.py     | 11 +++
 .../scripts/containers/ComponentDetailView.jsx  |  2 +-
 .../storm/src/main/resources/ui/package.json    | 20 ++--
 29 files changed, 257 insertions(+), 131 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/ed50bc38/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
----------------------------------------------------------------------


Mime
View raw message