Repository: cassandra Updated Branches: refs/heads/trunk a70982162 -> ea3ff25a0
Upgrade java-driver used by cassandra-stress patch by tjake; reviewed by benedict for CASSANDRA-8842 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/407b5de6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/407b5de6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/407b5de6 Branch: refs/heads/trunk Commit: 407b5de67cd06ff9e58b3288b8db243e67bc037d Parents: e4980b3 Author: T Jake Luciani <j...@apache.org> Authored: Fri Feb 20 11:24:43 2015 -0500 Committer: T Jake Luciani <j...@apache.org> Committed: Fri Feb 20 11:32:59 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.xml | 2 +- tools/lib/cassandra-driver-core-2.0.5.jar | Bin 544552 -> 0 bytes tools/lib/cassandra-driver-core-2.0.9.2.jar | Bin 0 -> 1847276 bytes 4 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/407b5de6/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 3b6ce5d..d9560fc 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.4 + * Upgrade java-driver used for cassandra-stress (CASSANDRA-8842) * Fix CommitLog.forceRecycleAllSegments() memory access error (CASSANDRA-8812) * Improve assertions in Memory (CASSANDRA-8792) * Fix SSTableRewriter cleanup (CASSANDRA-8802) http://git-wip-us.apache.org/repos/asf/cassandra/blob/407b5de6/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index eaef534..e969085 100644 --- a/build.xml +++ b/build.xml @@ -401,7 +401,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.5" /> + <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" version="2.0.9.2" /> <dependency groupId="net.sf.supercsv" artifactId="super-csv" version="2.1.0" /> <dependency groupId="net.ju-n.compile-command-annotations" artifactId="compile-command-annotations" version="1.2.0" /> </dependencyManagement> http://git-wip-us.apache.org/repos/asf/cassandra/blob/407b5de6/tools/lib/cassandra-driver-core-2.0.5.jar ---------------------------------------------------------------------- diff --git a/tools/lib/cassandra-driver-core-2.0.5.jar b/tools/lib/cassandra-driver-core-2.0.5.jar deleted file mode 100644 index 260183e..0000000 Binary files a/tools/lib/cassandra-driver-core-2.0.5.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/407b5de6/tools/lib/cassandra-driver-core-2.0.9.2.jar ---------------------------------------------------------------------- diff --git a/tools/lib/cassandra-driver-core-2.0.9.2.jar b/tools/lib/cassandra-driver-core-2.0.9.2.jar new file mode 100644 index 0000000..3f82e77 Binary files /dev/null and b/tools/lib/cassandra-driver-core-2.0.9.2.jar differ
