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/3e305f80 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e305f80 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e305f80 Branch: refs/heads/trunk Commit: 3e305f80980952b0fb9241e97c75728ca55b25be Parents: bcec4ea c5c0585 Author: Tyler Hobbs <[email protected]> Authored: Fri Sep 19 11:25:43 2014 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Fri Sep 19 11:25:43 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 +- .../cql3/statements/SelectStatement.java | 22 ++++++++ .../cql3/SelectWithTokenFunctionTest.java | 55 ++++++++++++++++++++ 3 files changed, 79 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e305f80/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e305f80/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java ----------------------------------------------------------------------
