You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/06/13 14:45:21 UTC
[8/8] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e428ae04
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e428ae04
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e428ae04
Branch: refs/heads/trunk
Commit: e428ae04c5f1e3bfba927872772a65dc10559ef2
Parents: 85956ae 5871b26
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jun 13 07:45:02 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jun 13 07:45:02 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 +-
src/java/org/apache/cassandra/db/Keyspace.java | 5 +
.../cassandra/metrics/KeyspaceMetrics.java | 267 +++++++++++++++++++
3 files changed, 273 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e428ae04/CHANGES.txt
----------------------------------------------------------------------