Repository: incubator-brooklyn Updated Branches: refs/heads/master f96847374 -> 846143cda
Update Catalog imports to reflect package rename Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/fd312f46 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/fd312f46 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/fd312f46 Branch: refs/heads/master Commit: fd312f46436372f36914563622c5f587c2f3cde8 Parents: f968473 Author: Mike Zaccardo <[email protected]> Authored: Wed Aug 5 11:32:09 2015 -0400 Committer: Mike Zaccardo <[email protected]> Committed: Wed Aug 5 11:32:09 2015 -0400 ---------------------------------------------------------------------- .../extra/src/main/java/brooklyn/entity/salt/SaltStackMaster.java | 2 +- .../java/brooklyn/entity/nosql/hazelcast/HazelcastCluster.java | 2 +- .../main/java/brooklyn/entity/nosql/hazelcast/HazelcastNode.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/fd312f46/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMaster.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMaster.java b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMaster.java index 5af9622..0db1841 100644 --- a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMaster.java +++ b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMaster.java @@ -20,7 +20,7 @@ package brooklyn.entity.salt; import java.util.List; -import brooklyn.catalog.Catalog; +import org.apache.brooklyn.catalog.Catalog; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.BrooklynConfigKeys; import brooklyn.entity.basic.ConfigKeys; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/fd312f46/sandbox/nosql/src/main/java/brooklyn/entity/nosql/hazelcast/HazelcastCluster.java ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/main/java/brooklyn/entity/nosql/hazelcast/HazelcastCluster.java b/sandbox/nosql/src/main/java/brooklyn/entity/nosql/hazelcast/HazelcastCluster.java index 48ab1aa..c91b78c 100644 --- a/sandbox/nosql/src/main/java/brooklyn/entity/nosql/hazelcast/HazelcastCluster.java +++ b/sandbox/nosql/src/main/java/brooklyn/entity/nosql/hazelcast/HazelcastCluster.java @@ -22,7 +22,7 @@ import java.util.List; import com.google.common.reflect.TypeToken; -import brooklyn.catalog.Catalog; +import org.apache.brooklyn.catalog.Catalog; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.group.DynamicCluster; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/fd312f46/sandbox/nosql/src/main/java/brooklyn/entity/nosql/hazelcast/HazelcastNode.java ---------------------------------------------------------------------- diff --git a/sandbox/nosql/src/main/java/brooklyn/entity/nosql/hazelcast/HazelcastNode.java b/sandbox/nosql/src/main/java/brooklyn/entity/nosql/hazelcast/HazelcastNode.java index 076b6f5..40aa330 100644 --- a/sandbox/nosql/src/main/java/brooklyn/entity/nosql/hazelcast/HazelcastNode.java +++ b/sandbox/nosql/src/main/java/brooklyn/entity/nosql/hazelcast/HazelcastNode.java @@ -18,7 +18,7 @@ */ package brooklyn.entity.nosql.hazelcast; -import brooklyn.catalog.Catalog; +import org.apache.brooklyn.catalog.Catalog; import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.SoftwareProcess;
