You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by ty...@apache.org on 2014/11/19 18:31:12 UTC

[5/5] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

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/90759185
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90759185
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/90759185

Branch: refs/heads/trunk
Commit: 90759185114d72d1b71409672ee406cb967427a8
Parents: b8cf172 25a4c9e
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Wed Nov 19 11:28:58 2014 -0600
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Wed Nov 19 11:28:58 2014 -0600

----------------------------------------------------------------------
 CHANGES.txt                                     |   2 +
 .../cql3/statements/SelectStatement.java        |  15 +-
 .../cassandra/cql3/MultiColumnRelationTest.java | 938 ++++++++++---------
 3 files changed, 494 insertions(+), 461 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/90759185/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/90759185/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
----------------------------------------------------------------------