cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [5/5] git commit: Merge remote-tracking branch 'origin/trunk' into trunk
Date Mon, 23 Jun 2014 15:31:14 GMT
Merge remote-tracking branch 'origin/trunk' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2941791a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2941791a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2941791a

Branch: refs/heads/trunk
Commit: 2941791a1ae997e65a6c58122d27b3e7e09591bb
Parents: 6921af2 c1ce969
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Mon Jun 23 10:31:04 2014 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Mon Jun 23 10:31:04 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../apache/cassandra/cql3/QueryProcessor.java   |   1 +
 .../cql3/statements/BatchStatement.java         |  91 +++++++-----
 .../transport/messages/BatchMessage.java        |  23 +--
 .../org/apache/cassandra/cql3/BatchTests.java   | 145 +++++++++++++++++++
 .../org/apache/cassandra/cql3/DeleteTest.java   |  25 +++-
 6 files changed, 225 insertions(+), 61 deletions(-)
----------------------------------------------------------------------



Mime
View raw message