Merge branch 'cassandra-3.11' into trunk

2017-10-17 06:10:32 -07:00 · 2017-10-17 06:10:32 -07:00 · 7f989edd26
parent 8406b206a6 bbda20155a
commit 7f989edd26
6 changed files with 1 additions and 0 deletions
--- a/CHANGES.txt
+++ b/CHANGES.txt
@ -151,6 +151,7 @@


 3.11.2
+ * Update jackson JSON jars (CASSANDRA-13949)
 * Avoid locks when checking LCS fanout and if we should defrag (CASSANDRA-13930)
 Merged from 3.0:
 * Don't let user drop or generally break tables in system_distributed (CASSANDRA-13813)
--- a/lib/jackson-core-asl-1.9.13.jar
+++ b/lib/jackson-core-asl-1.9.13.jar
--- a/lib/jackson-core-asl-1.9.2.jar
+++ b/lib/jackson-core-asl-1.9.2.jar
--- a/lib/jackson-mapper-asl-1.9.13.jar
+++ b/lib/jackson-mapper-asl-1.9.13.jar
--- a/lib/licenses/jackson-core-asl-1.9.13.txt
+++ b/lib/licenses/jackson-core-asl-1.9.13.txt
--- a/lib/licenses/jackson-mapper-asl-1.9.13.txt
+++ b/lib/licenses/jackson-mapper-asl-1.9.13.txt