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/6a5495af Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a5495af Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6a5495af Branch: refs/heads/trunk Commit: 6a5495afe4e89f3d9de8cb6c961104027774e2f0 Parents: 383d35e 7eae57a Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Apr 29 09:32:13 2013 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon Apr 29 09:32:13 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 3 +- .../cassandra/cql3/statements/Selection.java | 42 ++++++++++++-- 2 files changed, 38 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a5495af/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a5495af/src/java/org/apache/cassandra/cql3/statements/Selection.java ----------------------------------------------------------------------
