Merge branch '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/ba56b822 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ba56b822 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ba56b822 Branch: refs/heads/trunk Commit: ba56b8221b5906633dc41155a6fc0a4a2b6571f7 Parents: b6d5f2c e389dc4 Author: blerer <benjamin.le...@datastax.com> Authored: Sun Aug 9 22:50:32 2015 +0200 Committer: blerer <benjamin.le...@datastax.com> Committed: Sun Aug 9 22:50:46 2015 +0200 ---------------------------------------------------------------------- .../restrictions/MultiColumnRestriction.java | 37 +++++++---- .../restrictions/SingleColumnRestriction.java | 68 ++++++++++++++++++-- .../SelectMultiColumnRelationTest.java | 45 +++++++++---- .../SelectSingleColumnRelationTest.java | 28 ++++++++ 4 files changed, 149 insertions(+), 29 deletions(-) ----------------------------------------------------------------------
