cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [7/7] git commit: Merge branch 'cassandra-2.1' into trunk
Date Thu, 16 Oct 2014 16:51:20 GMT
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/service/paxos/PaxosState.java


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

Branch: refs/heads/trunk
Commit: 4eb653541441d50cb8f7825f4d1c425288d1e65b
Parents: 175d347 ca16e5b
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Thu Oct 16 11:51:02 2014 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Thu Oct 16 11:51:02 2014 -0500

----------------------------------------------------------------------
 .../cassandra/metrics/ColumnFamilyMetrics.java  |  10 ++
 .../cassandra/metrics/KeyspaceMetrics.java      |  10 ++
 .../apache/cassandra/service/StorageProxy.java  | 149 ++++++++++++-------
 .../cassandra/service/paxos/PaxosState.java     |  95 +++++++-----
 4 files changed, 172 insertions(+), 92 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4eb65354/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------


Mime
View raw message