You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/01/20 22:04:39 UTC
[5/6] incubator-brooklyn git commit: This closes #1162
This closes #1162
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/2a164a82
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/2a164a82
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/2a164a82
Branch: refs/heads/master
Commit: 2a164a82f388e659f2c66dd8402c47ab6dfc0f90
Parents: 27cd092 47e2aec
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Jan 20 21:04:15 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Jan 20 21:04:15 2016 +0000
----------------------------------------------------------------------
brooklyn-docs/guide/misc/release-notes.md | 4 +-
.../internal/AbstractBrooklynObjectSpec.java | 25 +++++++++++-
.../brooklyn/spi/creation/CampResolver.java | 2 +-
.../catalog/CatalogYamlTemplateTest.java | 40 ++++++++++++++++++++
.../core/mgmt/EntityManagementUtils.java | 18 ++++-----
.../typereg/AbstractTypePlanTransformer.java | 3 +-
.../core/typereg/BasicRegisteredType.java | 1 +
7 files changed, 80 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a164a82/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlTemplateTest.java
----------------------------------------------------------------------
diff --cc brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlTemplateTest.java
index a759fed,78c1bf7..d83711c
--- a/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlTemplateTest.java
+++ b/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlTemplateTest.java
@@@ -40,7 -40,9 +40,8 @@@ import org.apache.brooklyn.entity.group
import org.apache.brooklyn.entity.stock.BasicApplication;
import org.apache.brooklyn.test.Asserts;
import org.apache.brooklyn.test.support.TestResourceUnavailableException;
+ import org.apache.brooklyn.util.core.config.ConfigBag;
import org.apache.brooklyn.util.osgi.OsgiTestResources;
-import org.python.google.common.collect.Iterables;
import org.testng.Assert;
import org.testng.TestListenerAdapter;
import org.testng.TestNG;