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/0b9b1fca Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b9b1fca Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b9b1fca Branch: refs/heads/cassandra-2.1 Commit: 0b9b1fca0a4dba50df8f26415f9b7aeedd0c5d9b Parents: dfcb734 926f639 Author: Tyler Hobbs <ty...@datastax.com> Authored: Fri May 23 11:21:01 2014 -0500 Committer: Tyler Hobbs <ty...@datastax.com> Committed: Fri May 23 11:21:01 2014 -0500 ---------------------------------------------------------------------- doc/cql3/CQL.textile | 20 +++++++++++++++----- .../apache/cassandra/cql3/QueryProcessor.java | 2 +- 2 files changed, 16 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b9b1fca/doc/cql3/CQL.textile ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b9b1fca/src/java/org/apache/cassandra/cql3/QueryProcessor.java ----------------------------------------------------------------------
