Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1c1a8a37 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1c1a8a37 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1c1a8a37 Branch: refs/heads/trunk Commit: 1c1a8a37a0af46474104aa687e110520cf4bec21 Parents: 13f21db 9bb16c3 Author: Sylvain Lebresne <[email protected]> Authored: Mon Oct 14 19:05:22 2013 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Mon Oct 14 19:05:22 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/cql3/QueryProcessor.java | 25 +++++++++++--------- .../apache/cassandra/cql3/UpdateParameters.java | 15 ++++++++---- .../cql3/statements/SelectStatement.java | 8 +++---- 4 files changed, 30 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c1a8a37/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c1a8a37/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java ----------------------------------------------------------------------
