You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2015/02/20 18:38:52 UTC
cassandra git commit: fix bad merge
Repository: cassandra
Updated Branches:
refs/heads/trunk ea3ff25a0 -> 9fdbb6559
fix bad merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9fdbb655
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9fdbb655
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9fdbb655
Branch: refs/heads/trunk
Commit: 9fdbb6559dc57341cd5b3382748250cfadc06ae5
Parents: ea3ff25
Author: T Jake Luciani <ja...@apache.org>
Authored: Fri Feb 20 12:38:28 2015 -0500
Committer: T Jake Luciani <ja...@apache.org>
Committed: Fri Feb 20 12:38:28 2015 -0500
----------------------------------------------------------------------
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9fdbb655/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 416f0e0..0b9d1a2 100644
--- a/build.xml
+++ b/build.xml
@@ -376,7 +376,7 @@
<dependency groupId="io.netty" artifactId="netty-all" version="4.0.23.Final" />
<dependency groupId="com.google.code.findbugs" artifactId="jsr305" version="2.0.2" />
<dependency groupId="com.clearspring.analytics" artifactId="stream" version="2.5.2" />
- <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" version="2.0.9.2" />
+ <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" version="2.1.2" />
<dependency groupId="org.javassist" artifactId="javassist" version="3.18.2-GA" />
<dependency groupId="org.caffinitas.ohc" artifactId="ohc-core" version="0.3.2" />
<dependency groupId="net.sf.supercsv" artifactId="super-csv" version="2.1.0" />