Merge branch 'cassandra-2.1' into trunk

Conflicts: build.xml
2015-01-30 12:02:42 -05:00 · 2015-01-30 12:02:42 -05:00 · 0b324c5e55
parent caa0359555 cdcf6461a3
commit 0b324c5e55
5 changed files with 2 additions and 1 deletions
--- a/CHANGES.txt
+++ b/CHANGES.txt
@ -57,6 +57,7 @@


 2.1.3
+ * Upgrade libthrift to 0.9.2 (CASSANDRA-8685)
 * Don't use the shared ref in sstableloader (CASSANDRA-8704)
 * Purge internal prepared statements if related tables or
   keyspaces are dropped (CASSANDRA-8693)
--- a/build.xml
+++ b/build.xml
@ -342,7 +342,7 @@
            <exclusion groupId="org.slf4j" artifactId="slf4j-log4j12"/>
          </dependency>
          <dependency groupId="org.yaml" artifactId="snakeyaml" version="1.11"/>
-          <dependency groupId="org.apache.thrift" artifactId="libthrift" version="0.9.1">
+          <dependency groupId="org.apache.thrift" artifactId="libthrift" version="0.9.2">
 	         <exclusion groupId="commons-logging" artifactId="commons-logging"/>
          </dependency>
          <dependency groupId="junit" artifactId="junit" version="4.6" />
--- a/lib/libthrift-0.9.1.jar
+++ b/lib/libthrift-0.9.1.jar
--- a/lib/libthrift-0.9.2.jar
+++ b/lib/libthrift-0.9.2.jar
--- a/lib/licenses/libthrift-0.9.2.txt
+++ b/lib/licenses/libthrift-0.9.2.txt