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/76d3e40e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/76d3e40e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/76d3e40e Branch: refs/heads/AMBARI-2.4.0.2 Commit: 76d3e40ed22b10e3a0351ceaedeb114c53219ad1 Parents: dd46f86 756320b Author: Jenkins <[email protected]> Authored: Fri Aug 19 22:46:00 2016 +0000 Committer: Jenkins <[email protected]> Committed: Fri Aug 19 22:46:00 2016 +0000 ---------------------------------------------------------------------- .../ATLAS/0.1.0.2.3/package/scripts/metadata.py | 8 ++-- .../stacks/2.3/ATLAS/test_metadata_server.py | 44 ++++++++++---------- .../stacks/2.5/ATLAS/test_atlas_server.py | 22 +++++----- 3 files changed, 37 insertions(+), 37 deletions(-) ----------------------------------------------------------------------
