Updated Branches: refs/heads/trunk 4042ef2dc -> b6062a5ca
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b6062a5c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b6062a5c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b6062a5c Branch: refs/heads/trunk Commit: b6062a5ca5068453ee67afc711a8953ab78bfa91 Parents: 4042ef2 89ab670 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Feb 20 17:52:56 2013 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Feb 20 17:52:56 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../cassandra/cql3/statements/SelectStatement.java | 32 ++++++++++---- 2 files changed, 25 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6062a5c/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6062a5c/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java ----------------------------------------------------------------------