Merge branch 'cassandra-3.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/a3c2d142 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a3c2d142 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a3c2d142 Branch: refs/heads/trunk Commit: a3c2d142ab409552e7ec46c5ef5c2f1bfc4093bf Parents: 43e13d9 0b990b7 Author: Sylvain Lebresne <[email protected]> Authored: Fri Sep 11 18:42:19 2015 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Fri Sep 11 18:42:19 2015 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cql3/QueryProcessor.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
