cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Mon, 21 Apr 2014 10:03:35 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5c364016
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c364016
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5c364016

Branch: refs/heads/cassandra-2.1
Commit: 5c364016ab9e3fdb4c31a7ef4f030c15d8065af1
Parents: cde7809 54bf92f
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Mon Apr 21 12:03:24 2014 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Mon Apr 21 12:03:24 2014 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../cql3/statements/SelectStatement.java        | 34 ++++++++++++--------
 .../cassandra/service/pager/QueryPager.java     |  2 +-
 3 files changed, 23 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c364016/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b0e8e0d,b976d64..d6d13c5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -98,6 -56,6 +98,7 @@@ Merged from 2.0
     (CASSANDRA-6906)
   * Fix SSTable not released if stream session fails (CASSANDRA-6818)
   * Avoid build failure due to ANTLR timeout (CASSANDRA-6991)
++ * Queries on compact tables can return more rows that requested (CASSANDRA-7052)
  Merged from 1.2:
   * Add UNLOGGED, COUNTER options to BATCH documentation (CASSANDRA-6816)
   * add extra SSL cipher suites (CASSANDRA-6613)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c364016/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
----------------------------------------------------------------------


Mime
View raw message