Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 c9e81ea7f -> 500d6b3a2 refs/heads/cassandra-3.5 bed6aae00 -> 9b1968fcb refs/heads/trunk eea0a0cef -> ae6809d07
Upgrade ohc to 0.4.3 patch by Robert Stupp; reviewed by Tyler Hobbs for CASSANDRA-11444 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/500d6b3a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/500d6b3a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/500d6b3a Branch: refs/heads/cassandra-3.0 Commit: 500d6b3a2cd402c13e452de14eb68923b845a09d Parents: c9e81ea Author: Robert Stupp <[email protected]> Authored: Wed Mar 30 09:00:10 2016 +0200 Committer: Robert Stupp <[email protected]> Committed: Wed Mar 30 09:00:10 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/500d6b3a/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index a9ccf98..ea0040f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.0.5 + * 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/500d6b3a/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 82fbfdc..5ece0f7 100644 --- a/build.xml +++ b/build.xml @@ -403,8 +403,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"/> @@ -456,8 +456,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"/> http://git-wip-us.apache.org/repos/asf/cassandra/blob/500d6b3a/lib/ohc-core-0.4.2.jar ---------------------------------------------------------------------- diff --git a/lib/ohc-core-0.4.2.jar b/lib/ohc-core-0.4.2.jar deleted file mode 100644 index 019adcd..0000000 Binary files a/lib/ohc-core-0.4.2.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/500d6b3a/lib/ohc-core-0.4.3.jar ---------------------------------------------------------------------- diff --git a/lib/ohc-core-0.4.3.jar b/lib/ohc-core-0.4.3.jar new file mode 100644 index 0000000..2f75a9d Binary files /dev/null and b/lib/ohc-core-0.4.3.jar differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/500d6b3a/lib/ohc-core-j8-0.4.2.jar ---------------------------------------------------------------------- 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 583f4aa..0000000 Binary files a/lib/ohc-core-j8-0.4.2.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/500d6b3a/lib/ohc-core-j8-0.4.3.jar ---------------------------------------------------------------------- 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 0000000..7f2007e Binary files /dev/null and b/lib/ohc-core-j8-0.4.3.jar differ
