Merge remote-tracking branch 'origin/apache-ref/branch-2.4' into 2.4.0-maint
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7d485739 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7d485739 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7d485739 Branch: refs/heads/AMBARI-2.4.0.2 Commit: 7d48573928899761b37e4b2cb39a7ffa1def9c46 Parents: ef5db1f e662dcb Author: Jenkins <[email protected]> Authored: Fri Aug 19 20:45:55 2016 +0000 Committer: Jenkins <[email protected]> Committed: Fri Aug 19 20:45:55 2016 +0000 ---------------------------------------------------------------------- .../libraries/functions/constants.py | 1 + .../ambari/server/stack/MasterHostResolver.java | 11 +- .../ambari/server/state/UpgradeHelper.java | 3 + .../apache/ambari/server/utils/HTTPUtils.java | 10 +- .../ATLAS/0.1.0.2.3/package/scripts/metadata.py | 12 +- .../package/scripts/metadata_server.py | 20 ++- .../ATLAS/0.1.0.2.3/package/scripts/params.py | 14 ++ .../0.1.0.2.3/package/scripts/status_params.py | 1 + .../package/templates/atlas_hbase_setup.rb.j2 | 24 +++ .../package/scripts/hbase_regionserver.py | 26 --- .../HDP/2.0.6/properties/stack_features.json | 5 + .../stacks/HDP/2.5/services/ATLAS/metainfo.xml | 36 +++++ .../ambari/server/state/UpgradeHelperTest.java | 86 +++++++++- .../2.0.6/HBASE/test_hbase_regionserver.py | 48 ------ .../stacks/2.3/ATLAS/test_metadata_server.py | 160 ++++++++++++++++++- .../stacks/2.5/ATLAS/test_atlas_server.py | 4 + 16 files changed, 369 insertions(+), 92 deletions(-) ----------------------------------------------------------------------
