Merge branch 'cassandra-2.1' into trunk

2014-05-19 14:34:04 -07:00 · 2014-05-19 14:34:04 -07:00 · c2cfefc507
parent f760e1f8b3 0f706c528e
commit c2cfefc507
3 changed files with 1 additions and 1 deletions
--- a/build.xml
+++ b/build.xml
@ -463,7 +463,7 @@
        <dependency groupId="org.mindrot" artifactId="jbcrypt"/>
        <dependency groupId="com.yammer.metrics" artifactId="metrics-core"/>
        <dependency groupId="com.addthis.metrics" artifactId="reporter-config"/>
-        <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.3"/>
+        <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.5"/>
        <dependency groupId="com.clearspring.analytics" artifactId="stream" version="2.5.2" />
        <dependency groupId="net.sf.supercsv" artifactId="super-csv" version="2.1.0" />

--- a/lib/licenses/thrift-server-0.3.5.txt
+++ b/lib/licenses/thrift-server-0.3.5.txt
--- a/lib/thrift-server-internal-only-0.3.3.jar
+++ b/lib/thrift-server-internal-only-0.3.3.jar