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/d7977f2c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d7977f2c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d7977f2c Branch: refs/heads/trunk Commit: d7977f2c4593d593b0ce309dae5501b1ceb51ff7 Parents: 0d94d2a f31c668 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sat Aug 24 03:27:35 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sat Aug 24 03:27:35 2013 +0300 ---------------------------------------------------------------------- pylib/cqlshlib/cql3handling.py | 2 +- src/java/org/apache/cassandra/cql3/Cql.g | 16 ++++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
