Repository: ambari Updated Branches: refs/heads/branch-2.6 4cc8976ce -> 99484dccd
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/83e9d89f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/83e9d89f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/83e9d89f Branch: refs/heads/branch-2.6 Commit: 83e9d89f2424fa671a3017e7cb695766ec4a9ef3 Parents: 2307c9d 6d50cd6 Author: Jonathan Hurley <[email protected]> Authored: Thu Aug 10 13:11:09 2017 -0400 Committer: Jonathan Hurley <[email protected]> Committed: Thu Aug 10 13:11:09 2017 -0400 ---------------------------------------------------------------------- .../upgrade/StackUpgradeFinishListener.java | 13 +++++++++++++ .../metadata/CachedRoleCommandOrderProvider.java | 10 ++++++++-- ambari-server/src/main/resources/scripts/configs.py | 2 +- .../stacks/BigInsights/4.2.5/repos/repoinfo.xml | 16 ++++++++++++++-- .../upgrade/StackUpgradeFinishListenerTest.java | 14 ++++++-------- 5 files changed, 42 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
