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/dffdae0c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dffdae0c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dffdae0c Branch: refs/heads/trunk Commit: dffdae0c94352d99ebc147dae6282670315e8fd2 Parents: 6618bd8 c65ef9a Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Sep 23 18:59:18 2014 -0700 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Sep 23 18:59:18 2014 -0700 ---------------------------------------------------------------------- .../cassandra/cql3/statements/SelectStatement.java | 4 ++-- .../cassandra/cql3/SelectWithTokenFunctionTest.java | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dffdae0c/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java ----------------------------------------------------------------------
