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/06 07:37:36 UTC
[1/2] git commit: fix group id (com.boundary) for high-scale-lib
Repository: cassandra
Updated Branches:
refs/heads/trunk 8f5c90382 -> 754643c5e
fix group id (com.boundary) for high-scale-lib
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aa3c10dd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa3c10dd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa3c10dd
Branch: refs/heads/trunk
Commit: aa3c10dd0c056da867f8f38f7a9799807ab9d199
Parents: 8f5c16c
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Tue May 6 01:36:53 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue May 6 01:36:53 2014 -0400
----------------------------------------------------------------------
build.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa3c10dd/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index e8d9dd9..fe3d970 100644
--- a/build.xml
+++ b/build.xml
@@ -362,7 +362,7 @@
<exclusion groupId="junit" artifactId="junit"/>
</dependency>
<dependency groupId="com.googlecode.json-simple" artifactId="json-simple" version="1.1"/>
- <dependency groupId="com.boundary.high-scale-lib" artifactId="high-scale-lib" version="1.0.5"/>
+ <dependency groupId="com.boundary" artifactId="high-scale-lib" version="1.0.5"/>
<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"/>
@@ -471,7 +471,7 @@
<dependency groupId="org.codehaus.jackson" artifactId="jackson-mapper-asl"/>
<dependency groupId="jline" artifactId="jline"/>
<dependency groupId="com.googlecode.json-simple" artifactId="json-simple"/>
- <dependency groupId="com.boundary.high-scale-lib" artifactId="high-scale-lib"/>
+ <dependency groupId="com.boundary" artifactId="high-scale-lib"/>
<dependency groupId="org.yaml" artifactId="snakeyaml"/>
<dependency groupId="org.mindrot" artifactId="jbcrypt"/>
<dependency groupId="com.yammer.metrics" artifactId="metrics-core"/>
[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/754643c5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/754643c5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/754643c5
Branch: refs/heads/trunk
Commit: 754643c5e4368d34102d0cd30def6571f1eddc2f
Parents: 8f5c903 aa3c10d
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Tue May 6 01:37:15 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue May 6 01:37:15 2014 -0400
----------------------------------------------------------------------
build.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/754643c5/build.xml
----------------------------------------------------------------------