Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0C98310387 for ; Thu, 5 Jun 2014 19:15:33 +0000 (UTC) Received: (qmail 53659 invoked by uid 500); 5 Jun 2014 19:15:33 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 53637 invoked by uid 500); 5 Jun 2014 19:15:33 -0000 Mailing-List: contact commits-help@brooklyn.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.incubator.apache.org Delivered-To: mailing list commits@brooklyn.incubator.apache.org Received: (qmail 53630 invoked by uid 99); 5 Jun 2014 19:15:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Jun 2014 19:15:32 +0000 X-ASF-Spam-Status: No, hits=-2000.7 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 05 Jun 2014 19:15:32 +0000 Received: (qmail 53542 invoked by uid 99); 5 Jun 2014 19:15:11 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Jun 2014 19:15:11 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9652194C6C6; Thu, 5 Jun 2014 19:15:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: richard@apache.org To: commits@brooklyn.incubator.apache.org Date: Thu, 05 Jun 2014 19:15:12 -0000 Message-Id: <5c72a5f6c72c4f2f9abecd9bb14ace94@git.apache.org> In-Reply-To: <25ee0cb552344f28b5f06487c84275da@git.apache.org> References: <25ee0cb552344f28b5f06487c84275da@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge pull request #1455 from aledsage/feature/QuarantineGroup-expungeMembers X-Virus-Checked: Checked by ClamAV on apache.org Merge pull request #1455 from aledsage/feature/QuarantineGroup-expungeMembers Adds expungeMembers to DynamicCluster’s QuarantineGroup Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ba8209b6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ba8209b6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ba8209b6 Branch: refs/heads/master Commit: ba8209b655e1cbe254f47e59d6ba499f2edd928a Parents: 338de66 148b503 Author: Richard Downer Authored: Thu Jun 5 21:05:48 2014 +0200 Committer: Richard Downer Committed: Thu Jun 5 21:05:48 2014 +0200 ---------------------------------------------------------------------- .../brooklyn/entity/group/DynamicCluster.java | 2 +- .../entity/group/DynamicClusterImpl.java | 6 +- .../brooklyn/entity/group/QuarantineGroup.java | 14 ++++ .../entity/group/QuarantineGroupImpl.java | 70 ++++++++++++++++++ .../entity/group/DynamicClusterTest.java | 13 ++++ .../entity/group/QuarantineGroupTest.java | 74 ++++++++++++++++++++ 6 files changed, 174 insertions(+), 5 deletions(-) ----------------------------------------------------------------------