diff --git a/CHANGES.txt b/CHANGES.txt index d81d2c56c2..0bda3a6431 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -163,6 +163,7 @@ Merged from 3.0: * Nodetool upgradesstables/scrub/compact ignores system tables (CASSANDRA-13410) * Fix schema version calculation for rolling upgrades (CASSANDRA-13441) Merged from 2.2: + * Upgrade JNA to version 4.4.0 (CASSANDRA-13072) * Avoid starting gossiper in RemoveTest (CASSANDRA-13407) * Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393) * Fix JVM metric names (CASSANDRA-13103) diff --git a/build.xml b/build.xml index feb8273f9f..d085495848 100644 --- a/build.xml +++ b/build.xml @@ -397,7 +397,7 @@ - + diff --git a/lib/futures-2.1.6-py2.py3-none-any.zip b/lib/futures-2.1.6-py2.py3-none-any.zip index 50bd78bf84..4c272435cf 100644 Binary files a/lib/futures-2.1.6-py2.py3-none-any.zip and b/lib/futures-2.1.6-py2.py3-none-any.zip differ diff --git a/lib/jna-4.3.0.jar b/lib/jna-4.3.0.jar deleted file mode 100644 index 713354e593..0000000000 Binary files a/lib/jna-4.3.0.jar and /dev/null differ diff --git a/lib/licenses/jna-4.3.0.txt b/lib/licenses/jna-4.4.0.txt similarity index 100% rename from lib/licenses/jna-4.3.0.txt rename to lib/licenses/jna-4.4.0.txt