Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8e943b3d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e943b3d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8e943b3d Branch: refs/heads/trunk Commit: 8e943b3dac644e6ca6a8848284e126164054634c Parents: 498eb2a 510c82e Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Apr 22 07:41:38 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Apr 22 07:41:38 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/cassandra.yaml | 5 +++ .../org/apache/cassandra/config/Config.java | 1 + .../cassandra/config/DatabaseDescriptor.java | 5 +++ .../apache/cassandra/cql3/QueryProcessor.java | 2 +- .../cql3/statements/BatchStatement.java | 42 +++++++++++++++++++- 6 files changed, 54 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8e943b3d/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8e943b3d/src/java/org/apache/cassandra/cql3/QueryProcessor.java ----------------------------------------------------------------------
