Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/83bf0d5d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/83bf0d5d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/83bf0d5d Branch: refs/heads/trunk Commit: 83bf0d5d591aaabebda0c86ccad88afe1db5e5f6 Parents: 936dea8 2001c25 Author: Tyler Hobbs <ty...@datastax.com> Authored: Wed Sep 3 13:05:36 2014 -0500 Committer: Tyler Hobbs <ty...@datastax.com> Committed: Wed Sep 3 13:05:36 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- .../org/apache/cassandra/cql3/statements/SelectStatement.java | 6 ++++++ .../org/apache/cassandra/cql3/MultiColumnRelationTest.java | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/83bf0d5d/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/83bf0d5d/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java ----------------------------------------------------------------------
