cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [6/6] git commit: Merge branch 'cassandra-2.0' into trunk
Date Sat, 05 Oct 2013 02:53:21 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/d75e63f1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d75e63f1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d75e63f1

Branch: refs/heads/trunk
Commit: d75e63f17b58ddebf58b5ccfaaf1876e493d5a37
Parents: b746087 27967f9
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Fri Oct 4 21:53:10 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Fri Oct 4 21:53:10 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../apache/cassandra/metrics/ClientMetrics.java | 35 ++++++++++++++++++
 .../cassandra/thrift/CassandraServer.java       | 18 ++++++++--
 .../cassandra/thrift/ThriftSessionManager.java  |  5 +++
 .../org/apache/cassandra/transport/Server.java  | 37 ++++++++++++++------
 5 files changed, 84 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d75e63f1/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d75e63f1/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------


Mime
View raw message