You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by jm...@apache.org on 2014/11/04 21:38:13 UTC

[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/db/AtomicSortedColumns.java
	src/java/org/apache/cassandra/db/ColumnFamilyStore.java
	src/java/org/apache/cassandra/db/Memtable.java
	src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java


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

Branch: refs/heads/cassandra-2.1
Commit: f7f4ddbf6f0ab5b4aa741b10e39f5465b740ff37
Parents: c816a7a e019760
Author: Joshua McKenzie <jm...@apache.org>
Authored: Tue Nov 4 14:27:25 2014 -0600
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Tue Nov 4 14:27:25 2014 -0600

----------------------------------------------------------------------
 src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7f4ddbf/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
----------------------------------------------------------------------