cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ble...@apache.org
Subject [6/6] cassandra git commit: Merge branch cassandra-3.11 into trunk
Date Fri, 10 Feb 2017 10:03:19 GMT
Merge branch cassandra-3.11 into trunk


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

Branch: refs/heads/trunk
Commit: 1effb10792fd556a3026b2f947f0ecba99a0c2d9
Parents: 1ade491 baa59cd
Author: Benjamin Lerer <b.lerer@gmail.com>
Authored: Fri Feb 10 11:01:27 2017 +0100
Committer: Benjamin Lerer <b.lerer@gmail.com>
Committed: Fri Feb 10 11:01:27 2017 +0100

----------------------------------------------------------------------
 CHANGES.txt                                        |  2 ++
 .../db/commitlog/MemoryMappedSegment.java          | 17 ++---------------
 2 files changed, 4 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1effb107/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6a0db37,c785f84..8565c9b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -45,9 -14,8 +45,11 @@@ Merged from 3.0
     live rows in sstabledump (CASSANDRA-13177)
   * Provide user workaround when system_schema.columns does not contain entries
     for a table that's in system_schema.tables (CASSANDRA-13180)
+ Merged from 2.2:
+   * Use only one file pointer when creating commitlog segments (CASSANDRA-12539)
 +Merged from 2.1:
 + * Upgrade netty version to fix memory leak with client encryption (CASSANDRA-13114)
 +
  
  3.10
   * Fix secondary index queries regression (CASSANDRA-13013)


Mime
View raw message