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/d3698f89 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d3698f89 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d3698f89 Branch: refs/heads/trunk Commit: d3698f8901eec59af6b3576c70a1cc2b15f384dc Parents: 99691be 38ae1be Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Sep 24 15:58:34 2013 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Sep 24 15:58:34 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/ResultSet.java | 11 +++++++---- .../cassandra/cql3/statements/SelectStatement.java | 4 +++- 3 files changed, 11 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d3698f89/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d3698f89/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java ----------------------------------------------------------------------
