cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcken...@apache.org
Subject [20/22] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1
Date Fri, 04 Dec 2015 18:20:37 GMT
Merge branch 'cassandra-3.0' into cassandra-3.1


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

Branch: refs/heads/cassandra-3.1
Commit: be99f44ef39f524b658346be1b5d6fcb9e54bb7a
Parents: 744daf0 5aa19cb
Author: Joshua McKenzie <jmckenzie@apache.org>
Authored: Fri Dec 4 13:19:27 2015 -0500
Committer: Joshua McKenzie <jmckenzie@apache.org>
Committed: Fri Dec 4 13:19:27 2015 -0500

----------------------------------------------------------------------
 .../db/SinglePartitionReadCommand.java          |  4 +-
 .../metrics/CASClientRequestMetrics.java        |  2 +-
 .../metrics/CassandraMetricsRegistry.java       | 10 ++--
 .../metrics/EstimatedHistogramReservoir.java    | 10 ++--
 .../cassandra/metrics/KeyspaceMetrics.java      |  8 +--
 .../apache/cassandra/metrics/TableMetrics.java  | 21 +++----
 .../cassandra/utils/EstimatedHistogram.java     | 31 +++++++---
 .../org/apache/cassandra/db/RowCacheTest.java   | 49 ++++++++++++++++
 .../cassandra/utils/EstimatedHistogramTest.java | 59 ++++++++++++++++++--
 9 files changed, 155 insertions(+), 39 deletions(-)
----------------------------------------------------------------------



Mime
View raw message