Merge branch cassandra-3.X into trunk

2016-10-20 17:24:32 +02:00 · 2016-10-20 17:24:32 +02:00 · 65405b9ed5
parent 0695307d80 af1afef564
commit 65405b9ed5
5 changed files with 2 additions and 1 deletions
--- a/CHANGES.txt
+++ b/CHANGES.txt
@ -6,6 +6,7 @@
 * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter (CASSANDRA-12422)

 3.10
+ * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 * Add duration data type (CASSANDRA-11873)
 * Make the fanout size for LeveledCompactionStrategy to be configurable (CASSANDRA-11550)
 * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
--- a/build.xml
+++ b/build.xml
@ -366,7 +366,7 @@
          <dependency groupId="com.google.guava" artifactId="guava" version="18.0"/>
          <dependency groupId="org.hdrhistogram" artifactId="HdrHistogram" version="2.1.9"/>
          <dependency groupId="commons-cli" artifactId="commons-cli" version="1.1"/>
-          <dependency groupId="commons-codec" artifactId="commons-codec" version="1.2"/>
+          <dependency groupId="commons-codec" artifactId="commons-codec" version="1.9"/>
          <dependency groupId="org.apache.commons" artifactId="commons-lang3" version="3.1"/>
          <dependency groupId="org.apache.commons" artifactId="commons-math3" version="3.2"/>
          <dependency groupId="com.googlecode.concurrentlinkedhashmap" artifactId="concurrentlinkedhashmap-lru" version="1.4"/>
--- a/lib/commons-codec-1.2.jar
+++ b/lib/commons-codec-1.2.jar
--- a/lib/commons-codec-1.9.jar
+++ b/lib/commons-codec-1.9.jar
--- a/lib/licenses/commons-codec-1.9.txt
+++ b/lib/licenses/commons-codec-1.9.txt