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 2014/02/07 17:19:04 UTC
[6/6] git commit: Merge branch 'cassandra-2.0' into trunk
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/ef6d42cf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ef6d42cf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ef6d42cf
Branch: refs/heads/trunk
Commit: ef6d42cfc522b555d9b1c20a418e90d83f7a29a3
Parents: d69529c 56a615d
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Feb 7 10:18:48 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Feb 7 10:18:48 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/ColumnFamilyStoreMBean.java | 2 +-
src/java/org/apache/cassandra/db/DataTracker.java | 5 +++--
src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java | 5 +++--
4 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef6d42cf/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef6d42cf/src/java/org/apache/cassandra/db/ColumnFamilyStoreMBean.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef6d42cf/src/java/org/apache/cassandra/db/DataTracker.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef6d42cf/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
----------------------------------------------------------------------