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/07/10 14:27:37 UTC
[1/6] git commit: fix jamm ver in debian
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 581ce6310 -> 4d8fea198
refs/heads/cassandra-2.1.0 ae374107b -> 420c68511
refs/heads/trunk ac4a0263f -> bb2fdd018
fix jamm ver in debian
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/420c6851
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/420c6851
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/420c6851
Branch: refs/heads/cassandra-2.1
Commit: 420c68511417e917925898e8c0637c9df3e317b0
Parents: ae37410
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jul 10 07:27:06 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jul 10 07:27:06 2014 -0500
----------------------------------------------------------------------
debian/cassandra.in.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/420c6851/debian/cassandra.in.sh
----------------------------------------------------------------------
diff --git a/debian/cassandra.in.sh b/debian/cassandra.in.sh
index 4da19d8..efb7abb 100644
--- a/debian/cassandra.in.sh
+++ b/debian/cassandra.in.sh
@@ -26,5 +26,5 @@ CLASSPATH="$CLASSPATH:$EXTRA_CLASSPATH"
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"
+ JAVA_AGENT="$JAVA_AGENT -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.6.jar"
fi
[4/6] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.1.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/4d8fea19
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d8fea19
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4d8fea19
Branch: refs/heads/trunk
Commit: 4d8fea198c15075f4719c1aabf4abc1becb610c8
Parents: 581ce63 420c685
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jul 10 07:27:14 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jul 10 07:27:14 2014 -0500
----------------------------------------------------------------------
debian/cassandra.in.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[5/6] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.1.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/4d8fea19
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d8fea19
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4d8fea19
Branch: refs/heads/cassandra-2.1
Commit: 4d8fea198c15075f4719c1aabf4abc1becb610c8
Parents: 581ce63 420c685
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jul 10 07:27:14 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jul 10 07:27:14 2014 -0500
----------------------------------------------------------------------
debian/cassandra.in.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[3/6] git commit: fix jamm ver in debian
Posted by br...@apache.org.
fix jamm ver in debian
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/420c6851
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/420c6851
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/420c6851
Branch: refs/heads/trunk
Commit: 420c68511417e917925898e8c0637c9df3e317b0
Parents: ae37410
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jul 10 07:27:06 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jul 10 07:27:06 2014 -0500
----------------------------------------------------------------------
debian/cassandra.in.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/420c6851/debian/cassandra.in.sh
----------------------------------------------------------------------
diff --git a/debian/cassandra.in.sh b/debian/cassandra.in.sh
index 4da19d8..efb7abb 100644
--- a/debian/cassandra.in.sh
+++ b/debian/cassandra.in.sh
@@ -26,5 +26,5 @@ CLASSPATH="$CLASSPATH:$EXTRA_CLASSPATH"
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"
+ JAVA_AGENT="$JAVA_AGENT -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.6.jar"
fi
[2/6] git commit: fix jamm ver in debian
Posted by br...@apache.org.
fix jamm ver in debian
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/420c6851
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/420c6851
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/420c6851
Branch: refs/heads/cassandra-2.1.0
Commit: 420c68511417e917925898e8c0637c9df3e317b0
Parents: ae37410
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jul 10 07:27:06 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jul 10 07:27:06 2014 -0500
----------------------------------------------------------------------
debian/cassandra.in.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/420c6851/debian/cassandra.in.sh
----------------------------------------------------------------------
diff --git a/debian/cassandra.in.sh b/debian/cassandra.in.sh
index 4da19d8..efb7abb 100644
--- a/debian/cassandra.in.sh
+++ b/debian/cassandra.in.sh
@@ -26,5 +26,5 @@ CLASSPATH="$CLASSPATH:$EXTRA_CLASSPATH"
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"
+ JAVA_AGENT="$JAVA_AGENT -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.6.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/bb2fdd01
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb2fdd01
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bb2fdd01
Branch: refs/heads/trunk
Commit: bb2fdd0183d3f231fb35ec75d2a3ed0a1f2a182e
Parents: ac4a026 4d8fea1
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jul 10 07:27:29 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jul 10 07:27:29 2014 -0500
----------------------------------------------------------------------
debian/cassandra.in.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------