Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f94b168a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f94b168a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f94b168a Branch: refs/heads/trunk Commit: f94b168aa1ad9a669a30f11da7dedabf2b87c7ce Parents: 77a6090 d7a03e6 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Jul 21 22:02:48 2015 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Jul 21 22:02:48 2015 +0300 ---------------------------------------------------------------------- .../org/apache/cassandra/cql3/statements/SelectStatement.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f94b168a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java ----------------------------------------------------------------------