You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2013/09/03 16:38:22 UTC
[5/8] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/14e7895e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14e7895e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/14e7895e
Branch: refs/heads/trunk
Commit: 14e7895e59c63f510a586e2847226e3aa5c8a30b
Parents: c7a835d 196038b
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Sep 3 16:35:27 2013 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Sep 3 16:35:27 2013 +0200
----------------------------------------------------------------------
build.xml | 2 +-
lib/netty-3.5.9.Final.jar | Bin 1128961 -> 0 bytes
lib/netty-3.6.6.Final.jar | Bin 0 -> 1206119 bytes
3 files changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/14e7895e/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 291b603,9e1de8d..74b3d0b
--- a/build.xml
+++ b/build.xml
@@@ -372,10 -379,14 +372,10 @@@
<dependency groupId="log4j" artifactId="log4j" version="1.2.16" />
<dependency groupId="org.apache.cassandra" artifactId="cassandra-all" version="${version}" />
<dependency groupId="org.apache.cassandra" artifactId="cassandra-thrift" version="${version}" />
- <dependency groupId="com.yammer.metrics" artifactId="metrics-core" version="2.0.3" />
+ <dependency groupId="com.yammer.metrics" artifactId="metrics-core" version="2.2.0" />
<dependency groupId="edu.stanford.ppl" artifactId="snaptree" version="0.1" />
<dependency groupId="org.mindrot" artifactId="jbcrypt" version="0.3m" />
- <dependency groupId="io.netty" artifactId="netty" version="3.5.9.Final" />
+ <dependency groupId="io.netty" artifactId="netty" version="3.6.6.Final" />
</dependencyManagement>
<developer id="alakshman" name="Avinash Lakshman"/>
<developer id="antelder" name="Anthony Elder"/>