Merge branch cassandra-2.2 into cassandra-3.0

2017-05-31 14:42:17 +02:00 · 2017-05-31 14:42:17 +02:00 · a2f742cd63
parent 8ffdd26cbe 3c81aa825d
commit a2f742cd63
5 changed files with 3 additions and 1 deletions
--- a/CHANGES.txt
+++ b/CHANGES.txt
@ -36,6 +36,8 @@
 * Nodetool upgradesstables/scrub/compact ignores system tables (CASSANDRA-13410)
 * Fix NPE issue in StorageService (CASSANDRA-13060)
 Merged from 2.2:
+ * upgrade JNA version to 4.4.0 (CASSANDRA-13072)
+ * nodetool upgradesstables should upgrade system tables (CASSANDRA-13119)
 * Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
 * Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393)
 * Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
--- a/build.xml
+++ b/build.xml
@ -380,7 +380,7 @@
          <dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster" version="1.0.3">
 		    <exclusion groupId="asm" artifactId="asm"/> <!-- this is the outdated version 3.1 -->
          </dependency>
-          <dependency groupId="net.java.dev.jna" artifactId="jna" version="4.0.0"/>
+          <dependency groupId="net.java.dev.jna" artifactId="jna" version="4.4.0"/>

          <dependency groupId="org.jacoco" artifactId="org.jacoco.agent" version="${jacoco.version}"/>
          <dependency groupId="org.jacoco" artifactId="org.jacoco.ant" version="${jacoco.version}"/>
--- a/lib/jna-4.0.0.jar
+++ b/lib/jna-4.0.0.jar
--- a/lib/jna-4.4.0.jar
+++ b/lib/jna-4.4.0.jar
--- a/lib/licenses/jna-4.4.0.txt
+++ b/lib/licenses/jna-4.4.0.txt