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/1527fabf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1527fabf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1527fabf Branch: refs/heads/trunk Commit: 1527fabfce29483cdc62bd98ffeaff7fc7d40903 Parents: f6106a1 61e329f Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Mar 27 11:42:26 2013 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Mar 27 11:42:26 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 + src/java/org/apache/cassandra/cql3/ResultSet.java | 11 +++--- .../cassandra/cql3/statements/SelectStatement.java | 25 ++++++++++++-- 3 files changed, 28 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1527fabf/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1527fabf/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java ----------------------------------------------------------------------
