You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sj...@apache.org on 2015/08/05 18:25:51 UTC
[1/2] incubator-brooklyn git commit: Update Catalog imports to
reflect package rename
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 <mi...@cloudsoftcorp.com>
Authored: Wed Aug 5 11:32:09 2015 -0400
Committer: Mike Zaccardo <mi...@cloudsoftcorp.com>
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;
[2/2] incubator-brooklyn git commit: This closes #796
Posted by sj...@apache.org.
This closes #796
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/846143cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/846143cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/846143cd
Branch: refs/heads/master
Commit: 846143cda87a3d41e41c5f4bb2d0cf9b2c9b1b11
Parents: f968473 fd312f4
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Wed Aug 5 17:25:23 2015 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Wed Aug 5 17:25:23 2015 +0100
----------------------------------------------------------------------
.../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(-)
----------------------------------------------------------------------