Merge branch cassandra-3.9 into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2aa665aa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2aa665aa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2aa665aa Branch: refs/heads/trunk Commit: 2aa665aa00faa01be4aee4bc3560d3a26a7dc46a Parents: dec1bdb 0702e45 Author: Benjamin Lerer <[email protected]> Authored: Mon Jul 4 14:44:06 2016 +0200 Committer: Benjamin Lerer <[email protected]> Committed: Mon Jul 4 14:44:26 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../ClusteringColumnRestrictions.java | 20 ++------ .../restrictions/MultiColumnRestriction.java | 2 +- .../SelectMultiColumnRelationTest.java | 27 ++++++++++ .../cql3/validation/operations/SelectTest.java | 54 ++++++++++++++++++++ 5 files changed, 86 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2aa665aa/CHANGES.txt ----------------------------------------------------------------------
