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/af593090 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af593090 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/af593090 Branch: refs/heads/trunk Commit: af593090b9695eb1c1f5c8ab337b48c85ae548ca Parents: 56c2f0a ef41567 Author: Sylvain Lebresne <[email protected]> Authored: Thu May 29 12:54:48 2014 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Thu May 29 12:54:48 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/cql3/statements/SelectStatement.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/af593090/CHANGES.txt ----------------------------------------------------------------------
