Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 324C3200BBB for ; Thu, 10 Nov 2016 17:58:33 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 30F56160B23; Thu, 10 Nov 2016 16:58:33 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 459EA160B1F for ; Thu, 10 Nov 2016 17:58:32 +0100 (CET) Received: (qmail 51413 invoked by uid 500); 10 Nov 2016 16:58:30 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 50888 invoked by uid 99); 10 Nov 2016 16:58:30 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Nov 2016 16:58:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 116CAF175B; Thu, 10 Nov 2016 16:58:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jonathanhurley@apache.org To: commits@ambari.apache.org Date: Thu, 10 Nov 2016 16:58:48 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [20/50] [abbrv] ambari git commit: Merge branch 'branch-feature-AMBARI-18634' into trunk archived-at: Thu, 10 Nov 2016 16:58:33 -0000 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/branch-feature-AMBARI-18456 Commit: d838763dcca7c5b3b65134dcbe6a0a8944020ace Parents: fa7704d 4689179 Author: Nate Cole Authored: Tue Nov 8 15:35:04 2016 -0500 Committer: Nate Cole 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(-) ----------------------------------------------------------------------