Merge remote-tracking branch 'asf/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/0edf5477 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0edf5477 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0edf5477 Branch: refs/heads/trunk Commit: 0edf54777ad18e3729c95552f5276016e00583a4 Parents: b10c00b be2c26f Author: blerer <[email protected]> Authored: Thu Aug 20 13:55:04 2015 +0200 Committer: blerer <[email protected]> Committed: Thu Aug 20 13:55:04 2015 +0200 ---------------------------------------------------------------------- .../cassandra/cql3/SingleColumnRelation.java | 2 +- .../org/apache/cassandra/cql3/TokenRelation.java | 2 +- .../operations/SelectMultiColumnRelationTest.java | 12 ++++++++++++ .../operations/SelectOrderedPartitionerTest.java | 10 ++++++++++ .../operations/SelectSingleColumnRelationTest.java | 17 +++++++++++++++++ 5 files changed, 41 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
