natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-3.0' into cassandra-3.5

This commit is contained in:
Robert Stupp 2016-03-30 09:00:41 +02:00
parent bed6aae00e 500d6b3a2c
commit 9b1968fcb6
6 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -2,6 +2,7 @@
* 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)

8
build.xml
View File

@ -412,8 +412,8 @@
<dependency groupId="com.clearspring.analytics" artifactId="stream" version="2.5.2" />
<dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" version="3.0.0" classifier="shaded" />
<dependency groupId="org.eclipse.jdt.core.compiler" artifactId="ecj" version="4.4.2" />
<dependency groupId="org.caffinitas.ohc" artifactId="ohc-core" version="0.4.2" />
<dependency groupId="org.caffinitas.ohc" artifactId="ohc-core-j8" version="0.4.2" />
<dependency groupId="org.caffinitas.ohc" artifactId="ohc-core" version="0.4.3" />
<dependency groupId="org.caffinitas.ohc" artifactId="ohc-core-j8" version="0.4.3" />
<dependency groupId="net.ju-n.compile-command-annotations" artifactId="compile-command-annotations" version="1.2.0" />
<dependency groupId="org.fusesource" artifactId="sigar" version="1.6.4">
<exclusion groupId="log4j" artifactId="log4j"/>
@ -470,8 +470,8 @@
<dependency groupId="org.antlr" artifactId="antlr"/>
<dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" classifier="shaded"/>
<dependency groupId="org.eclipse.jdt.core.compiler" artifactId="ecj"/>
<dependency groupId="org.caffinitas.ohc" artifactId="ohc-core" version="0.4.2" />
<dependency groupId="org.caffinitas.ohc" artifactId="ohc-core-j8" version="0.4.2" />
<dependency groupId="org.caffinitas.ohc" artifactId="ohc-core" version="0.4.3" />
<dependency groupId="org.caffinitas.ohc" artifactId="ohc-core-j8" version="0.4.3" />
<dependency groupId="org.openjdk.jmh" artifactId="jmh-core"/>
<dependency groupId="org.openjdk.jmh" artifactId="jmh-generator-annprocess"/>
<dependency groupId="net.ju-n.compile-command-annotations" artifactId="compile-command-annotations"/>

BIN
lib/ohc-core-0.4.2.jar
View File

Binary file not shown.

BIN
lib/ohc-core-0.4.3.jar Normal file
View File

Binary file not shown.

BIN
lib/ohc-core-j8-0.4.2.jar
View File

Binary file not shown.

BIN
lib/ohc-core-j8-0.4.3.jar Normal file
View File

Binary file not shown.