Merge branch 'branch-2.5' into branch-2.6
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6d50cd68 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6d50cd68 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6d50cd68 Branch: refs/heads/branch-2.6 Commit: 6d50cd68bcd5f2a163a924a980a9ae92dc6e4257 Parents: 0ea9e97 b02146c Author: Jonathan Hurley <[email protected]> Authored: Thu Aug 10 13:02:01 2017 -0400 Committer: Jonathan Hurley <[email protected]> Committed: Thu Aug 10 13:02:01 2017 -0400 ---------------------------------------------------------------------- .../upgrade/StackUpgradeFinishListener.java | 13 +++++++++++++ .../metadata/CachedRoleCommandOrderProvider.java | 10 ++++++++-- .../upgrades/FinalizeUpgradeAction.java | 4 ++++ ambari-server/src/main/resources/scripts/configs.py | 2 +- .../stacks/BigInsights/4.2.5/repos/repoinfo.xml | 16 ++++++++++++++-- .../upgrade/StackUpgradeFinishListenerTest.java | 14 ++++++-------- 6 files changed, 46 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
