Updated Branches: refs/heads/trunk 52e09c100 -> 25c7a7147
Merge branch 'cassandra-1.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/25c7a714 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25c7a714 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/25c7a714 Branch: refs/heads/trunk Commit: 25c7a71476504d4a90b7c369cc14b523b0df8e67 Parents: 52e09c1 59f349d Author: Dave Brosius <[email protected]> Authored: Wed May 30 20:35:33 2012 -0400 Committer: Dave Brosius <[email protected]> Committed: Wed May 30 20:35:33 2012 -0400 ---------------------------------------------------------------------- CHANGES.txt | 3 + .../org/apache/cassandra/cql/QueryProcessor.java | 39 +++++++++------ .../org/apache/cassandra/cql3/QueryProcessor.java | 40 +++++++++------ 3 files changed, 51 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/25c7a714/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/25c7a714/src/java/org/apache/cassandra/cql/QueryProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/25c7a714/src/java/org/apache/cassandra/cql3/QueryProcessor.java ----------------------------------------------------------------------
