Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0b990b79 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b990b79 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b990b79 Branch: refs/heads/trunk Commit: 0b990b79854a744e054990438067fa08bfca7bc7 Parents: 665f747 0d5908b Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Sep 11 18:42:05 2015 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Sep 11 18:42:05 2015 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cql3/QueryProcessor.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b990b79/src/java/org/apache/cassandra/cql3/QueryProcessor.java ----------------------------------------------------------------------
