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 2015/09/04 15:37:00 UTC
[09/11] incubator-brooklyn git commit: remove the cassandra snitch
jar. no binaries should be in sources apart from tests.
remove the cassandra snitch jar. no binaries should be in sources apart from tests.
it can be built and added when needed. it is not required for operation or tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/9b279d94
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/9b279d94
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/9b279d94
Branch: refs/heads/0.8.0-incubating
Commit: 9b279d9415016f04ac676651f6647a154d281a20
Parents: 988b9d6
Author: Alex Heneveld <al...@cloudsoft.io>
Authored: Thu Sep 3 23:43:24 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Sep 4 14:33:51 2015 +0100
----------------------------------------------------------------------
.../entity/nosql/cassandra/CassandraNode.java | 1 +
.../cassandra/cassandra-multicloud-snitch.jar | Bin 15292 -> 0 bytes
2 files changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b279d94/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNode.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNode.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNode.java
index d5c7e2f..683c16d 100644
--- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNode.java
+++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNode.java
@@ -98,6 +98,7 @@ public interface CassandraNode extends DatastoreMixins.DatastoreCommon, Software
// some of the cassandra tooing (eg nodetool) use RMI, but we want JMXMP, so do both!
ConfigKey<JmxAgentModes> JMX_AGENT_MODE = ConfigKeys.newConfigKeyWithDefault(UsesJmx.JMX_AGENT_MODE, JmxAgentModes.JMXMP_AND_RMI);
+ // TODO the multicloud-snitch has to be built manually, it is available in the brooklyn sandbox
@SetFromFlag("customSnitchJarUrl")
ConfigKey<String> CUSTOM_SNITCH_JAR_URL = ConfigKeys.newStringConfigKey("cassandra.config.customSnitchUrl",
"URL for a jar file to be uploaded (e.g. \"classpath://org/apache/brooklyn/entity/nosql/cassandra/cassandra-multicloud-snitch.jar\"); defaults to null which means nothing to upload",
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b279d94/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/cassandra/cassandra-multicloud-snitch.jar
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/cassandra/cassandra-multicloud-snitch.jar b/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/cassandra/cassandra-multicloud-snitch.jar
deleted file mode 100644
index 2197705..0000000
Binary files a/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/cassandra/cassandra-multicloud-snitch.jar and /dev/null differ