diff --git a/CHANGES.txt b/CHANGES.txt index ec958d4737..d4729a2fba 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -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) diff --git a/build.xml b/build.xml index 264a0bef86..2caa203cc1 100644 --- a/build.xml +++ b/build.xml @@ -412,8 +412,8 @@ - - + + @@ -470,8 +470,8 @@ - - + + diff --git a/lib/ohc-core-0.4.2.jar b/lib/ohc-core-0.4.2.jar deleted file mode 100644 index 019adcd3f8..0000000000 Binary files a/lib/ohc-core-0.4.2.jar and /dev/null differ diff --git a/lib/ohc-core-0.4.3.jar b/lib/ohc-core-0.4.3.jar new file mode 100644 index 0000000000..2f75a9d3e2 Binary files /dev/null and b/lib/ohc-core-0.4.3.jar differ diff --git a/lib/ohc-core-j8-0.4.2.jar b/lib/ohc-core-j8-0.4.2.jar deleted file mode 100644 index 583f4aaaff..0000000000 Binary files a/lib/ohc-core-j8-0.4.2.jar and /dev/null differ diff --git a/lib/ohc-core-j8-0.4.3.jar b/lib/ohc-core-j8-0.4.3.jar new file mode 100644 index 0000000000..7f2007ef39 Binary files /dev/null and b/lib/ohc-core-j8-0.4.3.jar differ