You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/09/05 18:04:50 UTC
[1/6] git commit: update build.xml for metrics-core 2.2.0
Updated Branches:
refs/heads/cassandra-1.2 1f6844261 -> 3d9c3dd3a
refs/heads/cassandra-2.0 12671160b -> 85be04bb2
refs/heads/trunk a9005cbb5 -> a6f036178
update build.xml for metrics-core 2.2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d9c3dd3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d9c3dd3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d9c3dd3
Branch: refs/heads/cassandra-1.2
Commit: 3d9c3dd3afe2627eac49db7cfd0764b9e3ef857e
Parents: 1f68442
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 5 11:04:20 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 5 11:04:26 2013 -0500
----------------------------------------------------------------------
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d9c3dd3/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 9e1de8d..122759c 100644
--- a/build.xml
+++ b/build.xml
@@ -383,7 +383,7 @@
<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.6.6.Final" />
[6/6] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by jb...@apache.org.
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/a6f03617
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a6f03617
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a6f03617
Branch: refs/heads/trunk
Commit: a6f03617860453f7658980f3f11d6f448c163f31
Parents: a9005cb 85be04b
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 5 11:04:42 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 5 11:04:42 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/6] git commit: update build.xml for metrics-core 2.2.0
Posted by jb...@apache.org.
update build.xml for metrics-core 2.2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d9c3dd3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d9c3dd3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d9c3dd3
Branch: refs/heads/cassandra-2.0
Commit: 3d9c3dd3afe2627eac49db7cfd0764b9e3ef857e
Parents: 1f68442
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 5 11:04:20 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 5 11:04:26 2013 -0500
----------------------------------------------------------------------
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d9c3dd3/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 9e1de8d..122759c 100644
--- a/build.xml
+++ b/build.xml
@@ -383,7 +383,7 @@
<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.6.6.Final" />
[5/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by jb...@apache.org.
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/85be04bb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/85be04bb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/85be04bb
Branch: refs/heads/cassandra-2.0
Commit: 85be04bb207826ad8098b1dd5aaf625694fad3c2
Parents: 1267116 3d9c3dd
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 5 11:04:33 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 5 11:04:33 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/6] git commit: update build.xml for metrics-core 2.2.0
Posted by jb...@apache.org.
update build.xml for metrics-core 2.2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d9c3dd3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d9c3dd3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d9c3dd3
Branch: refs/heads/trunk
Commit: 3d9c3dd3afe2627eac49db7cfd0764b9e3ef857e
Parents: 1f68442
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 5 11:04:20 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 5 11:04:26 2013 -0500
----------------------------------------------------------------------
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d9c3dd3/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 9e1de8d..122759c 100644
--- a/build.xml
+++ b/build.xml
@@ -383,7 +383,7 @@
<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.6.6.Final" />
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by jb...@apache.org.
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/85be04bb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/85be04bb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/85be04bb
Branch: refs/heads/trunk
Commit: 85be04bb207826ad8098b1dd5aaf625694fad3c2
Parents: 1267116 3d9c3dd
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 5 11:04:33 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 5 11:04:33 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------