diff --git a/CHANGES.txt b/CHANGES.txt index c1ae2b92c6..bd7bf09a0a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -8,6 +8,7 @@ (CASSANDRA-5300) * Fix PropertyFileSnitch default DC/Rack behavior (CASSANDRA-5285) * Handle null values when executing prepared statement (CASSANDRA-5081) + * Add netty to pom dependencies (CASSANDRA-5181) Merged from 1.1: * nodetool: ability to repair specific range (CASSANDRA-5280) * Fix possible assertion triggered in SliceFromReadCommand (CASSANDRA-5284) diff --git a/build.xml b/build.xml index 1fd2bf92b4..1ab9c94b49 100644 --- a/build.xml +++ b/build.xml @@ -380,6 +380,7 @@ +