You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/02/26 21:27:19 UTC

[1/6] git commit: Silence errors about java agent in debian scripts. Patch by Federico Piccinini, reviewed by brandonwilliams for CASSANDRA-6775

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 157cbdfad -> 7b5bdd256
  refs/heads/cassandra-2.1 583041f54 -> fbf075d28
  refs/heads/trunk 8809d8ada -> 9c4824d6c


Silence errors about java agent in debian scripts.
Patch by Federico Piccinini, reviewed by brandonwilliams for
CASSANDRA-6775


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7b5bdd25
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7b5bdd25
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7b5bdd25

Branch: refs/heads/cassandra-2.0
Commit: 7b5bdd256a74202d04496f288ca9cb2a9b6e9b6f
Parents: 157cbdf
Author: Brandon Williams <br...@apache.org>
Authored: Wed Feb 26 14:23:02 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Feb 26 14:23:02 2014 -0600

----------------------------------------------------------------------
 debian/cassandra.in.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b5bdd25/debian/cassandra.in.sh
----------------------------------------------------------------------
diff --git a/debian/cassandra.in.sh b/debian/cassandra.in.sh
index 13005e2..4da19d8 100644
--- a/debian/cassandra.in.sh
+++ b/debian/cassandra.in.sh
@@ -19,4 +19,12 @@ for jar in /usr/share/cassandra/*.jar; do
     CLASSPATH=$CLASSPATH:$jar
 done
 
-CLASSPATH="$CLASSPATH:$EXTRA_CLASSPATH"
\ No newline at end of file
+CLASSPATH="$CLASSPATH:$EXTRA_CLASSPATH"
+
+
+# set JVM javaagent opts to avoid warnings/errors
+if [ "$JVM_VENDOR" != "OpenJDK" -o "$JVM_VERSION" \> "1.6.0" ] \
+      || [ "$JVM_VERSION" = "1.6.0" -a "$JVM_PATCH_VERSION" -ge 23 ]
+then
+    JAVA_AGENT="$JAVA_AGENT -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar"
+fi

[3/6] git commit: Silence errors about java agent in debian scripts. Patch by Federico Piccinini, reviewed by brandonwilliams for CASSANDRA-6775

Posted by br...@apache.org.
Silence errors about java agent in debian scripts.
Patch by Federico Piccinini, reviewed by brandonwilliams for
CASSANDRA-6775


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7b5bdd25
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7b5bdd25
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7b5bdd25

Branch: refs/heads/trunk
Commit: 7b5bdd256a74202d04496f288ca9cb2a9b6e9b6f
Parents: 157cbdf
Author: Brandon Williams <br...@apache.org>
Authored: Wed Feb 26 14:23:02 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Feb 26 14:23:02 2014 -0600

----------------------------------------------------------------------
 debian/cassandra.in.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b5bdd25/debian/cassandra.in.sh
----------------------------------------------------------------------
diff --git a/debian/cassandra.in.sh b/debian/cassandra.in.sh
index 13005e2..4da19d8 100644
--- a/debian/cassandra.in.sh
+++ b/debian/cassandra.in.sh
@@ -19,4 +19,12 @@ for jar in /usr/share/cassandra/*.jar; do
     CLASSPATH=$CLASSPATH:$jar
 done
 
-CLASSPATH="$CLASSPATH:$EXTRA_CLASSPATH"
\ No newline at end of file
+CLASSPATH="$CLASSPATH:$EXTRA_CLASSPATH"
+
+
+# set JVM javaagent opts to avoid warnings/errors
+if [ "$JVM_VENDOR" != "OpenJDK" -o "$JVM_VERSION" \> "1.6.0" ] \
+      || [ "$JVM_VERSION" = "1.6.0" -a "$JVM_PATCH_VERSION" -ge 23 ]
+then
+    JAVA_AGENT="$JAVA_AGENT -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar"
+fi

[6/6] git commit: Merge branch 'cassandra-2.1' into trunk

Posted by br...@apache.org.
Merge branch 'cassandra-2.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9c4824d6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c4824d6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9c4824d6

Branch: refs/heads/trunk
Commit: 9c4824d6c47681d1245df2806f768083e76301ab
Parents: 8809d8a fbf075d
Author: Brandon Williams <br...@apache.org>
Authored: Wed Feb 26 14:24:26 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Feb 26 14:24:26 2014 -0600

----------------------------------------------------------------------
 debian/cassandra.in.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------

[4/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fbf075d2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fbf075d2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fbf075d2

Branch: refs/heads/trunk
Commit: fbf075d28a3820e8d52afc7fcf3fc2260e2e3197
Parents: 583041f 7b5bdd2
Author: Brandon Williams <br...@apache.org>
Authored: Wed Feb 26 14:24:17 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Feb 26 14:24:17 2014 -0600

----------------------------------------------------------------------
 debian/cassandra.in.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------

[2/6] git commit: Silence errors about java agent in debian scripts. Patch by Federico Piccinini, reviewed by brandonwilliams for CASSANDRA-6775

Posted by br...@apache.org.
Silence errors about java agent in debian scripts.
Patch by Federico Piccinini, reviewed by brandonwilliams for
CASSANDRA-6775


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7b5bdd25
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7b5bdd25
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7b5bdd25

Branch: refs/heads/cassandra-2.1
Commit: 7b5bdd256a74202d04496f288ca9cb2a9b6e9b6f
Parents: 157cbdf
Author: Brandon Williams <br...@apache.org>
Authored: Wed Feb 26 14:23:02 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Feb 26 14:23:02 2014 -0600

----------------------------------------------------------------------
 debian/cassandra.in.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b5bdd25/debian/cassandra.in.sh
----------------------------------------------------------------------
diff --git a/debian/cassandra.in.sh b/debian/cassandra.in.sh
index 13005e2..4da19d8 100644
--- a/debian/cassandra.in.sh
+++ b/debian/cassandra.in.sh
@@ -19,4 +19,12 @@ for jar in /usr/share/cassandra/*.jar; do
     CLASSPATH=$CLASSPATH:$jar
 done
 
-CLASSPATH="$CLASSPATH:$EXTRA_CLASSPATH"
\ No newline at end of file
+CLASSPATH="$CLASSPATH:$EXTRA_CLASSPATH"
+
+
+# set JVM javaagent opts to avoid warnings/errors
+if [ "$JVM_VENDOR" != "OpenJDK" -o "$JVM_VERSION" \> "1.6.0" ] \
+      || [ "$JVM_VERSION" = "1.6.0" -a "$JVM_PATCH_VERSION" -ge 23 ]
+then
+    JAVA_AGENT="$JAVA_AGENT -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar"
+fi

[5/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fbf075d2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fbf075d2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fbf075d2

Branch: refs/heads/cassandra-2.1
Commit: fbf075d28a3820e8d52afc7fcf3fc2260e2e3197
Parents: 583041f 7b5bdd2
Author: Brandon Williams <br...@apache.org>
Authored: Wed Feb 26 14:24:17 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Feb 26 14:24:17 2014 -0600

----------------------------------------------------------------------
 debian/cassandra.in.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------