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 6D7CF104EA for ; Thu, 20 Nov 2014 17:01:28 +0000 (UTC) Received: (qmail 30030 invoked by uid 500); 20 Nov 2014 17:01:28 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 30007 invoked by uid 500); 20 Nov 2014 17:01:28 -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 29998 invoked by uid 99); 20 Nov 2014 17:01:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Nov 2014 17:01:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_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, 20 Nov 2014 17:01:06 +0000 Received: (qmail 29688 invoked by uid 99); 20 Nov 2014 17:01:04 -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, 20 Nov 2014 17:01:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 35137925BAE; Thu, 20 Nov 2014 17:01:04 +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: Thu, 20 Nov 2014 17:01:07 -0000 Message-Id: <7ae54b64bb5148a29510bbcfd75e3941@git.apache.org> In-Reply-To: <3d8f397e6fc547b2a007fb5366ae221c@git.apache.org> References: <3d8f397e6fc547b2a007fb5366ae221c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] incubator-brooklyn git commit: This closes #346 X-Virus-Checked: Checked by ClamAV on apache.org This closes #346 Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/0f50c58b Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/0f50c58b Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/0f50c58b Branch: refs/heads/master Commit: 0f50c58b678e7a7a53768f03ef4824cddc1fdb86 Parents: 068de70 7888f82 Author: Aled Sage Authored: Thu Nov 20 17:00:50 2014 +0000 Committer: Aled Sage Committed: Thu Nov 20 17:00:50 2014 +0000 ---------------------------------------------------------------------- .../catalog/internal/BasicBrooklynCatalog.java | 2 +- .../src/main/java/brooklyn/util/osgi/Osgis.java | 33 +++++++++++----- .../internal/CatalogItemComparatorTest.java | 13 ++++++- .../test/java/brooklyn/util/osgi/OsgisTest.java | 41 ++++++++++++++++++++ .../brooklyn/catalog/CatalogYamlEntityTest.java | 4 +- .../src/main/webapp/assets/js/model/entity.js | 2 +- .../rest/resources/CatalogResourceTest.java | 13 +++++++ 7 files changed, 92 insertions(+), 16 deletions(-) ----------------------------------------------------------------------