Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f82646e8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f82646e8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f82646e8 Branch: refs/heads/trunk Commit: f82646e8164e8aaff78b1c861e75de3630c2a491 Parents: 27f4b41 8ab41c8 Author: Sylvain Lebresne <[email protected]> Authored: Fri Jan 22 15:51:35 2016 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Fri Jan 22 15:51:35 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../cql3/statements/SelectStatement.java | 22 ++++++---- .../operations/SelectOrderByTest.java | 43 ++++++++++++++++++++ 3 files changed, 60 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f82646e8/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f82646e8/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java ----------------------------------------------------------------------
