Merge 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/5e9835ba Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5e9835ba Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5e9835ba Branch: refs/heads/trunk Commit: 5e9835ba79e3b35715531b06536c5f10326de690 Parents: 85bbbb3 47b66d7 Author: blerer <[email protected]> Authored: Mon Aug 17 11:14:33 2015 +0200 Committer: blerer <[email protected]> Committed: Mon Aug 17 11:14:53 2015 +0200 ---------------------------------------------------------------------- .../restrictions/PrimaryKeyRestrictionSet.java | 2 +- .../cql3/statements/SelectStatement.java | 2 + .../operations/SelectOrderByTest.java | 43 ++++++++++++++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
