Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3e6b2992 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e6b2992 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e6b2992 Branch: refs/heads/trunk Commit: 3e6b29925686dac0275c2db64e3a3b69203b1747 Parents: 30e2bff 48d7e40 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Apr 22 10:12:47 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Apr 22 10:12:47 2014 +0200 ---------------------------------------------------------------------- doc/cql3/CQL.textile | 16 +++++++++++++++- .../org/apache/cassandra/cql3/QueryProcessor.java | 2 +- 2 files changed, 16 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e6b2992/doc/cql3/CQL.textile ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e6b2992/src/java/org/apache/cassandra/cql3/QueryProcessor.java ----------------------------------------------------------------------
