Merge branch 'branch-2.4' into branch-2.5
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4a6ea842 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4a6ea842 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4a6ea842 Branch: refs/heads/branch-2.5 Commit: 4a6ea8425b7ef08de9b9e69f8f9e04eab36b2504 Parents: a6bb655 446b5ca Author: Sumit Mohanty <[email protected]> Authored: Mon Aug 29 19:33:02 2016 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Mon Aug 29 19:33:02 2016 -0700 ---------------------------------------------------------------------- .../libraries/functions/conf_select.py | 6 + .../libraries/functions/copy_tarball.py | 4 +- ambari-server/conf/unix/ambari.properties | 4 +- ambari-server/set-hdp-repo-url.sh | 2 +- .../HBaseEnvMaxDirectMemorySizeAction.java | 87 +++++ .../main/python/ambari_server/serverSetup.py | 4 +- .../ATLAS/0.1.0.2.3/package/scripts/metadata.py | 2 + .../package/scripts/metadata_server.py | 2 +- .../ATLAS/0.1.0.2.3/package/scripts/params.py | 3 + .../2.1.0.2.0/package/scripts/hdfs_namenode.py | 92 ++++-- .../alert_hive_interactive_thrift_port.py | 4 +- .../0.12.0.2.0/package/scripts/params_linux.py | 2 + .../0.12.0.2.0/package/scripts/service_check.py | 13 +- .../OOZIE/4.0.0.2.0/package/scripts/oozie.py | 8 +- .../1.2.1/configuration/spark-defaults.xml | 8 + .../configuration/spark-thrift-sparkconf.xml | 10 +- .../2.0.0/configuration/spark2-defaults.xml | 10 +- .../configuration/spark2-thrift-sparkconf.xml | 8 + .../resources/stacks/HDP/2.3/repos/repoinfo.xml | 2 +- .../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 4 + .../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml | 4 + .../stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 9 + .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml | 9 + .../resources/stacks/HDP/2.4/repos/repoinfo.xml | 2 +- .../resources/stacks/HDP/2.5/repos/repoinfo.xml | 18 +- .../stacks/HDP/2.5/services/ATLAS/metainfo.xml | 2 +- .../HBaseEnvMaxDirectMemorySizeActionTest.java | 194 +++++++++++ .../python/stacks/2.0.6/HDFS/test_namenode.py | 322 +++++++------------ .../stacks/2.3/ATLAS/test_metadata_server.py | 6 + .../test/python/stacks/2.3/configs/default.json | 3 + .../test/python/stacks/2.3/configs/secure.json | 3 + .../stacks/2.5/ATLAS/test_atlas_server.py | 2 + .../test/python/stacks/2.5/configs/default.json | 3 + .../mixins/common/configs/configs_comparator.js | 5 +- 34 files changed, 585 insertions(+), 272 deletions(-) ----------------------------------------------------------------------
