Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/916efcb6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/916efcb6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/916efcb6 Branch: refs/heads/trunk Commit: 916efcb6fb4d0b1c788c74e97053701155d0ed1d Parents: 0229323 7d21569 Author: Jason Brown <[email protected]> Authored: Fri Sep 5 16:48:17 2014 -0700 Committer: Jason Brown <[email protected]> Committed: Fri Sep 5 16:48:17 2014 -0700 ---------------------------------------------------------------------- build.xml | 4 ++-- lib/thrift-server-0.3.6.jar | Bin 39588 -> 0 bytes lib/thrift-server-0.3.7.jar | Bin 0 -> 39988 bytes 3 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/916efcb6/build.xml ---------------------------------------------------------------------- diff --cc build.xml index 00d1c86,5f2b568..8016a8b --- a/build.xml +++ b/build.xml @@@ -493,10 -495,9 +493,10 @@@ <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.6"/> + <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.7"/> <dependency groupId="com.clearspring.analytics" artifactId="stream" version="2.5.2" /> <dependency groupId="net.sf.supercsv" artifactId="super-csv" version="2.1.0" /> + <dependency groupId="org.javassist" artifactId="javassist"/> <dependency groupId="ch.qos.logback" artifactId="logback-core"/> <dependency groupId="ch.qos.logback" artifactId="logback-classic"/>
