cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ble...@apache.org
Subject [3/3] cassandra git commit: Merge branch cassandra-3.5 into trunk
Date Thu, 10 Mar 2016 11:06:22 GMT
Merge branch cassandra-3.5 into trunk


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

Branch: refs/heads/trunk
Commit: 9e1437c146fc387b7e18a0ecb6af5efef0c173a2
Parents: 40b9e2c 47a2d48
Author: Benjamin Lerer <b.lerer@gmail.com>
Authored: Thu Mar 10 12:03:34 2016 +0100
Committer: Benjamin Lerer <b.lerer@gmail.com>
Committed: Thu Mar 10 12:03:46 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                                   | 2 ++
 .../apache/cassandra/service/pager/AbstractQueryPager.java    | 7 +++++--
 src/java/org/apache/cassandra/service/pager/PagingState.java  | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e1437c1/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 348d866,58c7ed0..56711b2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,7 +1,13 @@@
 +3.6
 + * Resolve some eclipse-warnings (CASSANDRA-11086)
 + * (cqlsh) Show static columns in a different color (CASSANDRA-11059)
 + * Allow to remove TTLs on table with default_time_to_live (CASSANDRA-11207)
 +
 +
  3.5
  Merged from 3.0:
+  * Fix paging for IN queries on tables without clustering columns (CASSANDRA-11208)
+  * Remove recursive call from CompositesSearcher (CASSANDRA-11304)
   * Fix filtering on non-primary key columns for queries without index (CASSANDRA-6377)
   * Fix sstableloader fail when using materialized view (CASSANDRA-11275)
  Merged from 2.2:


Mime
View raw message