Merge branch cassandra-2.2 into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7927ace3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7927ace3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7927ace3 Branch: refs/heads/cassandra-3.0 Commit: 7927ace3ea302806de751543710f85692c4615df Parents: b360653 c8d9555 Author: Benjamin Lerer <b.le...@gmail.com> Authored: Thu Apr 28 11:13:18 2016 +0200 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Thu Apr 28 11:13:18 2016 +0200 ---------------------------------------------------------------------- .../SelectMultiColumnRelationTest.java | 1678 +++++++++--------- .../cql3/validation/operations/SelectTest.java | 72 + 2 files changed, 918 insertions(+), 832 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7927ace3/test/unit/org/apache/cassandra/cql3/validation/operations/SelectMultiColumnRelationTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7927ace3/test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java ----------------------------------------------------------------------
