diff --git a/CHANGES.txt b/CHANGES.txt index 103da7b63a..8e4597f45a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0 + * Update netty to 4.1.128 (CASSANDRA-14633) * Add a virtual table to expose thread pools (CASSANDRA-14523) * Add a virtual table to expose caches (CASSANDRA-14538) * Fix toDate function for timestamp arguments (CASSANDRA-14502) diff --git a/build.xml b/build.xml index 311bd7d26a..5fb9edf3b1 100644 --- a/build.xml +++ b/build.xml @@ -468,7 +468,7 @@ - + diff --git a/lib/licenses/netty-4.1.14.txt b/lib/licenses/netty-4.1.28.txt similarity index 100% rename from lib/licenses/netty-4.1.14.txt rename to lib/licenses/netty-4.1.28.txt diff --git a/lib/netty-all-4.1.14.Final.jar b/lib/netty-all-4.1.28.Final.jar similarity index 52% rename from lib/netty-all-4.1.14.Final.jar rename to lib/netty-all-4.1.28.Final.jar index e5c81377a7..058662ecc9 100644 Binary files a/lib/netty-all-4.1.14.Final.jar and b/lib/netty-all-4.1.28.Final.jar differ