Merge branch 'branch-2.6' into branch-feature-AMBARI-21450
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/445c7b01 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/445c7b01 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/445c7b01 Branch: refs/heads/branch-feature-AMBARI-21450 Commit: 445c7b0119078793649452389b78d60dd98804cb Parents: 1edd300 596b145 Author: Jonathan Hurley <[email protected]> Authored: Mon Aug 21 09:37:39 2017 -0400 Committer: Jonathan Hurley <[email protected]> Committed: Mon Aug 21 09:37:39 2017 -0400 ---------------------------------------------------------------------- .../core/providers/package/yumrpm.py | 32 +-- ambari-server/src/main/assemblies/server.xml | 1 - .../DRUID/0.9.2/package/scripts/druid.py | 26 ++- .../HIVE/0.12.0.2.0/configuration/hive-site.xml | 218 +++++++++++++++++++ .../HIVE/0.12.0.2.0/metainfo.xml | 1 + .../0.12.0.2.0/package/scripts/params_linux.py | 11 + .../stacks/HDP/2.6/services/stack_advisor.py | 49 ++++- .../stacks/HDP/2.6/upgrades/config-upgrade.xml | 14 ++ .../src/main/resources/version_definition.xsd | 2 + .../stacks/2.5/common/test_stack_advisor.py | 107 ++++++++- .../test/python/stacks/2.6/DRUID/test_druid.py | 8 +- .../stacks/2.6/common/test_stack_advisor.py | 60 ++++- ambari-web/app/views/common/sort_view.js | 26 ++- .../app/views/main/alert_definitions_view.js | 9 +- ambari-web/test/views/common/sort_view_test.js | 49 ++++- 15 files changed, 559 insertions(+), 54 deletions(-) ----------------------------------------------------------------------
