cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject [5/5] git commit: Merge branch 'cassandra-2.0' into trunk
Date Thu, 22 Aug 2013 00:53:12 GMT
Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 99b5040403af55e16ff37f9e50f5e6d5352de32e
Parents: 751b1e1 37a6792
Author: Dave Brosius <dbrosius@apache.org>
Authored: Wed Aug 21 20:52:39 2013 -0400
Committer: Dave Brosius <dbrosius@apache.org>
Committed: Wed Aug 21 20:52:39 2013 -0400

----------------------------------------------------------------------
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/99b50404/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index d153882,4fc9817..33e4f51
--- a/build.xml
+++ b/build.xml
@@@ -354,10 -353,8 +354,10 @@@
            <dependency groupId="com.googlecode.json-simple" artifactId="json-simple" version="1.1"/>
            <dependency groupId="com.github.stephenc.high-scale-lib" artifactId="high-scale-lib"
version="1.1.2"/>
            <dependency groupId="com.github.stephenc" artifactId="jamm" version="0.2.5"/>
 -	   <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.0"/>
 +	      <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.0">
 +	      	<exclusion groupId="org.slf4j" artifactId="slf4j-log4j12"/>
 +          </dependency>
-           <dependency groupId="org.yaml" artifactId="snakeyaml" version="1.6"/>
+           <dependency groupId="org.yaml" artifactId="snakeyaml" version="1.11"/>
            <dependency groupId="org.apache.thrift" artifactId="libthrift" version="0.9.0"/>
  
            <dependency groupId="junit" artifactId="junit" version="4.6" />


Mime
View raw message