cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject [2/3] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Fri, 14 Aug 2015 15:31:26 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6445dd62
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6445dd62
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6445dd62

Branch: refs/heads/trunk
Commit: 6445dd62bb3b5318da24a005cb3bc1f15be86b34
Parents: f8f6fd2 1ba949a
Author: Robert Stupp <snazy@snazy.de>
Authored: Fri Aug 14 17:24:31 2015 +0200
Committer: Robert Stupp <snazy@snazy.de>
Committed: Fri Aug 14 17:24:31 2015 +0200

----------------------------------------------------------------------
 build.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6445dd62/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index bc433ae,26c3524..06638f6
--- a/build.xml
+++ b/build.xml
@@@ -558,8 -540,9 +558,8 @@@
          <dependency groupId="org.mindrot" artifactId="jbcrypt"/>
          <dependency groupId="io.dropwizard.metrics" artifactId="metrics-core"/>
          <dependency groupId="com.addthis.metrics" artifactId="reporter-config3"/>
-         <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="com.thinkaurelius.thrift" artifactId="thrift-server"/>
+         <dependency groupId="com.clearspring.analytics" artifactId="stream"/>
 -        <dependency groupId="net.sf.supercsv" artifactId="super-csv"/>
  
          <dependency groupId="ch.qos.logback" artifactId="logback-core"/>
          <dependency groupId="ch.qos.logback" artifactId="logback-classic"/>
@@@ -580,14 -563,12 +580,14 @@@
          
          <!-- don't need jamm unless running a server in which case it needs to be a -javagent
to be used anyway -->
          <dependency groupId="com.github.jbellis" artifactId="jamm"/>
 -		<dependency groupId="com.github.tjake" artifactId="crc32ex"/>
 +
          <dependency groupId="io.netty" artifactId="netty-all"/>
        	
-       	<dependency groupId="joda-time" artifactId="joda-time" version="2.4" />
+       	<dependency groupId="joda-time" artifactId="joda-time"/>
  
-         <dependency groupId="org.fusesource" artifactId="sigar" version="1.6.4"/>
+         <dependency groupId="org.fusesource" artifactId="sigar"/>
 +      	
 +        <dependency groupId="org.eclipse.jdt.core.compiler" artifactId="ecj" />
        </artifact:pom>
        <artifact:pom id="thrift-pom"
                      artifactId="cassandra-thrift"


Mime
View raw message