Merge remote-tracking branch 'origin/cassandra-2.1' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a175f70f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a175f70f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a175f70f Branch: refs/heads/cassandra-2.1 Commit: a175f70fa569fa505da9eecd37d3a55523de484c Parents: 2420cb4 bf9b49c Author: Jonathan Ellis <[email protected]> Authored: Mon Jun 23 10:30:55 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Mon Jun 23 10:30:55 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/cql3/QueryProcessor.java | 1 + .../cql3/statements/BatchStatement.java | 91 +++++++----- .../transport/messages/BatchMessage.java | 24 +-- .../org/apache/cassandra/cql3/BatchTests.java | 145 +++++++++++++++++++ .../org/apache/cassandra/cql3/DeleteTest.java | 27 ++-- 6 files changed, 226 insertions(+), 63 deletions(-) ----------------------------------------------------------------------
