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/e239ea61 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e239ea61 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e239ea61 Branch: refs/heads/trunk Commit: e239ea61e45bb4bba2e82583687f0e8461f1a884 Parents: c04d74f 08f2e97 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Nov 21 09:53:59 2013 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Nov 21 09:53:59 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 4 ++++ doc/cql3/CQL.textile | 8 ++++++-- pylib/cqlshlib/formatting.py | 8 +++++++- src/java/org/apache/cassandra/cql3/Cql.g | 3 +++ src/java/org/apache/cassandra/cql3/QueryProcessor.java | 2 +- 6 files changed, 22 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e239ea61/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e239ea61/NEWS.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e239ea61/src/java/org/apache/cassandra/cql3/Cql.g ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e239ea61/src/java/org/apache/cassandra/cql3/QueryProcessor.java ----------------------------------------------------------------------
