Merge branch 'branch-feature-AMBARI-18634' into trunk
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d838763d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d838763d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d838763d Branch: refs/heads/trunk Commit: d838763dcca7c5b3b65134dcbe6a0a8944020ace Parents: fa7704d 4689179 Author: Nate Cole <[email protected]> Authored: Tue Nov 8 15:35:04 2016 -0500 Committer: Nate Cole <[email protected]> Committed: Tue Nov 8 15:35:04 2016 -0500 ---------------------------------------------------------------------- .../ClusterStackVersionResourceProvider.java | 221 +++++++++++-------- .../org/apache/ambari/server/state/Cluster.java | 6 +- .../org/apache/ambari/server/state/Host.java | 14 ++ .../server/state/cluster/ClusterImpl.java | 17 +- .../ambari/server/state/host/HostImpl.java | 27 +++ .../state/stack/upgrade/HostOrderGrouping.java | 9 +- ...ClusterStackVersionResourceProviderTest.java | 184 +++++++++++++++ .../ambari/server/state/UpgradeHelperTest.java | 10 + .../server/state/cluster/ClusterTest.java | 33 ++- 9 files changed, 407 insertions(+), 114 deletions(-) ----------------------------------------------------------------------
