You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bl...@apache.org on 2015/11/26 17:44:58 UTC
[2/2] cassandra git commit: Merge branch cassandra-3.0 into
cassandra-3.1
Merge branch cassandra-3.0 into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e3113c94
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e3113c94
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e3113c94
Branch: refs/heads/cassandra-3.1
Commit: e3113c9476138dbcfab05abf98f560b9c1e33ad1
Parents: 0e5aa51 7e6c1d5
Author: Benjamin Lerer <b....@gmail.com>
Authored: Thu Nov 26 17:44:39 2015 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Thu Nov 26 17:44:39 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 4 +
NEWS.txt | 9 ++
.../cql3/statements/SelectStatement.java | 91 ++++++++++++++------
.../apache/cassandra/db/filter/DataLimits.java | 20 +++--
.../operations/SelectOrderByTest.java | 41 +++++++++
5 files changed, 129 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e3113c94/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e0d578d,e1a959a..5ea2b45
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,6 +1,9 @@@
-3.0.1
++
+3.1
+Merged from 3.0:
++=======
+ * Fix SELECT statement with IN restrictions on partition key,
+ ORDER BY and LIMIT (CASSANDRA-10729)
* Improve stress performance over 1k threads (CASSANDRA-7217)
* Wait for migration responses to complete before bootstrapping (CASSANDRA-10731)
* Unable to create a function with argument of type Inet (CASSANDRA-10741)