cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject [5/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.5
Date Wed, 30 Mar 2016 07:03:33 GMT
Merge branch 'cassandra-3.0' into cassandra-3.5


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

Branch: refs/heads/cassandra-3.5
Commit: 9b1968fcb67c25ca60668dca4f99cc58e4942875
Parents: bed6aae 500d6b3
Author: Robert Stupp <snazy@snazy.de>
Authored: Wed Mar 30 09:00:41 2016 +0200
Committer: Robert Stupp <snazy@snazy.de>
Committed: Wed Mar 30 09:00:41 2016 +0200

----------------------------------------------------------------------
 CHANGES.txt               |   1 +
 build.xml                 |   8 ++++----
 lib/ohc-core-0.4.2.jar    | Bin 126802 -> 0 bytes
 lib/ohc-core-0.4.3.jar    | Bin 0 -> 127053 bytes
 lib/ohc-core-j8-0.4.2.jar | Bin 4994 -> 0 bytes
 lib/ohc-core-j8-0.4.3.jar | Bin 0 -> 4995 bytes
 6 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b1968fc/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ec958d4,ea0040f..d4729a2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
 -3.0.5
 +3.5
 + * Avoid index segment stitching in RAM which lead to OOM on big SSTable files (CASSANDRA-11383)
 + * Fix clustering and row filters for LIKE queries on clustering columns (CASSANDRA-11397)
 +Merged from 3.0:
+  * Upgrade ohc to 0.4.3
   * Enable SO_REUSEADDR for JMX RMI server sockets (CASSANDRA-11093)
   * Allocate merkletrees with the correct size (CASSANDRA-11390)
   * Support streaming pre-3.0 sstables (CASSANDRA-10990)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b1968fc/build.xml
----------------------------------------------------------------------


Mime
View raw message