Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/43105f7f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/43105f7f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/43105f7f Branch: refs/heads/trunk Commit: 43105f7f16395c20e11b3a1c036308ee293abe60 Parents: 7678661 bfb0647 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed Aug 21 18:52:00 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Aug 21 18:52:00 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/43105f7f/CHANGES.txt ----------------------------------------------------------------------
