Merge branch 'cassandra-2.1.0' into cassandra-2.1
Conflicts:
src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/94f1107e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/94f1107e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/94f1107e
Branch: refs/heads/cassandra-2.1
Commit: 94f1107eca2f5965d6fc55ccf718a23a2f4fe2b7
Parents: 854aab7 8da1343
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Fri Aug 22 16:16:46 2014 +0200
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Fri Aug 22 16:16:46 2014 +0200
----------------------------------------------------------------------
build.xml | 2 +-
tools/lib/cassandra-driver-core-2.0.4.jar | Bin 544025 -> 0 bytes
tools/lib/cassandra-driver-core-2.0.5.jar | Bin 0 -> 544552 bytes
3 files changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/94f1107e/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index d747bbc,16ff03b..e678d88
--- a/build.xml
+++ b/build.xml
@@@ -399,16 -400,12 +399,16 @@@
<dependency groupId="io.netty" artifactId="netty-all"
version="4.0.20.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.4" />
+ <dependency groupId="com.datastax.cassandra"
artifactId="cassandra-driver-core" version="2.0.5" />
<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>
<developer id="alakshman" name="Avinash Lakshman"/>
- <developer id="antelder" name="Anthony Elder"/>
+ <developer id="aleksey" name="Aleksey Yeschenko"/>
+ <developer id="amorton" name="Aaron Morton"/>
+ <developer id="benedict" name="Benedict Elliott Smith"/>
<developer id="brandonwilliams" name="Brandon Williams"/>
+ <developer id="dbrosius" name="David Brosius"/>
<developer id="eevans" name="Eric Evans"/>
<developer id="gdusbabek" name="Gary Dusbabek"/>
<developer id="goffinet" name="Chris Goffinet"/>
