Repository: cassandra
Updated Branches:
  refs/heads/trunk 6b4c8a973 -> 55772088e


Upgrade lz4 to 1.4.0

patch by Michael Kjellman; reviewed by jasobrown for CASSANDRA-13741


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

Branch: refs/heads/trunk
Commit: 55772088e0f6e227c45df935bd8283492a5f73f8
Parents: 6b4c8a9
Author: Michael Kjellman <kjell...@apple.com>
Authored: Tue Sep 26 22:31:11 2017 -0700
Committer: Jason Brown <jasedbr...@gmail.com>
Committed: Fri Sep 29 05:47:32 2017 -0700

----------------------------------------------------------------------
 CHANGES.txt            |   1 +
 build.xml              |   4 ++--
 lib/lz4-1.3.0.jar      | Bin 277311 -> 0 bytes
 lib/lz4-java-1.4.0.jar | Bin 0 -> 370119 bytes
 4 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/55772088/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index f2f23bd..6e91a48 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 4.0
+ * Update lz4 to 1.4.0 (13741)
  * Optimize Paxos prepare and propose stage for local requests 
(CASSANDRA-13862)
  * Throttle base partitions during MV repair streaming to prevent OOM 
(CASSANDRA-13299)
  * Use compaction threshold for STCS in L0 (CASSANDRA-13861)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/55772088/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 63518c5..4e7f9b1 100644
--- a/build.xml
+++ b/build.xml
@@ -358,7 +358,7 @@
         <scm connection="${scm.connection}" 
developerConnection="${scm.developerConnection}" url="${scm.url}"/>
         <dependencyManagement>
           <dependency groupId="org.xerial.snappy" artifactId="snappy-java" 
version="1.1.2.6"/>
-          <dependency groupId="net.jpountz.lz4" artifactId="lz4" 
version="1.3.0"/>
+          <dependency groupId="org.lz4" artifactId="lz4-java" version="1.4.0"/>
           <dependency groupId="com.ning" artifactId="compress-lzf" 
version="0.8.4"/>
           <dependency groupId="com.google.guava" artifactId="guava" 
version="18.0"/>
           <dependency groupId="org.hdrhistogram" artifactId="HdrHistogram" 
version="2.1.9"/>
@@ -565,7 +565,7 @@
                 version="${version}"/>
         <scm connection="${scm.connection}" 
developerConnection="${scm.developerConnection}" url="${scm.url}"/>
         <dependency groupId="org.xerial.snappy" artifactId="snappy-java"/>
-        <dependency groupId="net.jpountz.lz4" artifactId="lz4"/>
+        <dependency groupId="org.lz4" artifactId="lz4-java"/>
         <dependency groupId="com.ning" artifactId="compress-lzf"/>
         <dependency groupId="com.google.guava" artifactId="guava"/>
         <dependency groupId="commons-cli" artifactId="commons-cli"/>

http://git-wip-us.apache.org/repos/asf/cassandra/blob/55772088/lib/lz4-1.3.0.jar
----------------------------------------------------------------------
diff --git a/lib/lz4-1.3.0.jar b/lib/lz4-1.3.0.jar
deleted file mode 100644
index 0fb0109..0000000
Binary files a/lib/lz4-1.3.0.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/55772088/lib/lz4-java-1.4.0.jar
----------------------------------------------------------------------
diff --git a/lib/lz4-java-1.4.0.jar b/lib/lz4-java-1.4.0.jar
new file mode 100644
index 0000000..301908b
Binary files /dev/null and b/lib/lz4-java-1.4.0.jar differ


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

Reply via email to