Merge branch 'cassandra-2.0.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bfb06473 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bfb06473 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bfb06473 Branch: refs/heads/cassandra-2.0 Commit: bfb06473ec13914aca7360706bff8e90cfd2ae79 Parents: 857a7f5 c8b220b Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed Aug 21 18:48:13 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Aug 21 18:48:13 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 10 ++---- src/java/org/apache/cassandra/cql3/Cql.g | 37 +++++++++----------- .../apache/cassandra/cql3/QueryProcessor.java | 9 ++--- 3 files changed, 23 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bfb06473/CHANGES.txt ----------------------------------------------------------------------
