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 30E78117AD for ; Sun, 7 Sep 2014 21:29:16 +0000 (UTC) Received: (qmail 35851 invoked by uid 500); 7 Sep 2014 21:29:15 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 35827 invoked by uid 500); 7 Sep 2014 21:29:15 -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 35785 invoked by uid 99); 7 Sep 2014 21:29:15 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Sep 2014 21:29:15 +0000 X-ASF-Spam-Status: No, hits=-2001.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; Sun, 07 Sep 2014 21:28:53 +0000 Received: (qmail 35664 invoked by uid 99); 7 Sep 2014 21:28:50 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Sep 2014 21:28:50 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 992CFA0D80E; Sun, 7 Sep 2014 21:28:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aledsage@apache.org To: commits@brooklyn.incubator.apache.org Date: Sun, 07 Sep 2014 21:28:57 -0000 Message-Id: <932b02362ac0438b927d6ee6de0149c8@git.apache.org> In-Reply-To: <5be208c21ce14871be47e03e1dd814d1@git.apache.org> References: <5be208c21ce14871be47e03e1dd814d1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [8/8] git commit: This closes #151 X-Virus-Checked: Checked by ClamAV on apache.org This closes #151 Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/dd7339eb Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/dd7339eb Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/dd7339eb Branch: refs/heads/master Commit: dd7339ebfd13ae9ea4b48bb9f68de271ae5b4d12 Parents: 56a2a75 b493076 Author: Aled Sage Authored: Sun Sep 7 22:28:17 2014 +0100 Committer: Aled Sage Committed: Sun Sep 7 22:28:17 2014 +0100 ---------------------------------------------------------------------- .../catalog/internal/CatalogLibrariesDo.java | 7 +- .../brooklyn/entity/basic/EntityAdjuncts.java | 7 +- .../entity/basic/ServiceStateLogic.java | 9 ++- .../entity/group/DynamicClusterImpl.java | 22 ++--- .../management/internal/LocalEntityManager.java | 17 ++++ .../entity/basic/AbstractEntityLegacyTest.java | 29 ------- .../brooklyn/entity/basic/DynamicGroupTest.java | 85 ++++++++++++++++++++ .../brooklyn/entity/basic/EntitySpecTest.java | 24 +++++- .../entity/basic/ServiceStateLogicTest.java | 4 +- .../HighAvailabilityManagerSplitBrainTest.java | 16 ++-- .../brooklyn/policy/ha/ServiceReplacerTest.java | 15 +++- 11 files changed, 171 insertions(+), 64 deletions(-) ----------------------------------------------------------------------