You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@brooklyn.apache.org by al...@apache.org on 2014/11/20 18:01:07 UTC

[4/4] incubator-brooklyn git commit: This closes #346

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 <al...@gmail.com>
Authored: Thu Nov 20 17:00:50 2014 +0000
Committer: Aled Sage <al...@gmail.com>
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(-)
----------------------------------------------------------------------