You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2014/05/03 02:45:56 UTC
[1/2] git commit: switch to using jamm with groupId
com.github.jbellis, as this one is published for 0.2.6
Repository: cassandra
Updated Branches:
refs/heads/trunk 909fd5bc9 -> e460e6c6b
switch to using jamm with groupId com.github.jbellis, as this one is published for 0.2.6
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/93fef850
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/93fef850
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/93fef850
Branch: refs/heads/trunk
Commit: 93fef85056716217bbe472cb0093ef1ab024345c
Parents: baee086
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Fri May 2 20:44:25 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Fri May 2 20:44:25 2014 -0400
----------------------------------------------------------------------
build.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/93fef850/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 36b9998..8fb0374 100644
--- a/build.xml
+++ b/build.xml
@@ -360,7 +360,7 @@
</dependency>
<dependency groupId="com.googlecode.json-simple" artifactId="json-simple" version="1.1"/>
<dependency groupId="com.github.stephenc.high-scale-lib" artifactId="high-scale-lib" version="1.1.2"/>
- <dependency groupId="com.github.stephenc" artifactId="jamm" version="0.2.6"/>
+ <dependency groupId="com.github.jbellis" artifactId="jamm" version="0.2.6"/>
<dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.3">
<exclusion groupId="org.slf4j" artifactId="slf4j-log4j12"/>
</dependency>
@@ -493,7 +493,7 @@
<dependency groupId="net.java.dev.jna" artifactId="jna" version="4.0.0"/>
<!-- don't need jamm unless running a server in which case it needs to be a -javagent to be used anyway -->
- <dependency groupId="com.github.stephenc" artifactId="jamm"/>
+ <dependency groupId="com.github.jbellis" artifactId="jamm"/>
<dependency groupId="io.netty" artifactId="netty"/>
</artifact:pom>
<artifact:pom id="thrift-pom"
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by db...@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/e460e6c6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e460e6c6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e460e6c6
Branch: refs/heads/trunk
Commit: e460e6c6b40e6662a89d63e9b319c18620b90a83
Parents: 909fd5b 93fef85
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Fri May 2 20:44:54 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Fri May 2 20:44:54 2014 -0400
----------------------------------------------------------------------
build.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e460e6c6/build.xml
----------------------------------------------------------------------