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/864865da Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/864865da Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/864865da Branch: refs/heads/trunk Commit: 864865da90543488618eb106e2bec6346c3ec79c Parents: 5f643ff 9bd3887 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu May 22 09:14:21 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu May 22 09:14:21 2014 -0500 ---------------------------------------------------------------------- .../apache/cassandra/cql3/QueryProcessor.java | 46 +++++++++++++------- .../cassandra/io/sstable/SSTableWriter.java | 3 +- 2 files changed, 33 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/864865da/src/java/org/apache/cassandra/cql3/QueryProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/864865da/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java ----------------------------------------------------------------------
