cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject [4/4] git commit: Merge branch 'cassandra-2.0' into trunk
Date Tue, 20 Aug 2013 21:58:51 GMT
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/8d2fdf39
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d2fdf39
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d2fdf39

Branch: refs/heads/trunk
Commit: 8d2fdf3993f77f7a7dac87a7ef1374b97b375d94
Parents: 7a46c97 e023897
Author: Dave Brosius <dbrosius@apache.org>
Authored: Tue Aug 20 17:56:02 2013 -0400
Committer: Dave Brosius <dbrosius@apache.org>
Committed: Tue Aug 20 17:56:02 2013 -0400

----------------------------------------------------------------------
 CHANGES.txt                                                    | 3 +++
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java        | 6 ++++--
 src/java/org/apache/cassandra/service/StorageService.java      | 4 ++--
 src/java/org/apache/cassandra/service/StorageServiceMBean.java | 4 ++--
 src/java/org/apache/cassandra/tools/NodeCmd.java               | 5 ++++-
 src/java/org/apache/cassandra/tools/NodeProbe.java             | 4 ++--
 6 files changed, 17 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d2fdf39/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d2fdf39/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d2fdf39/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d2fdf39/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------


Mime
View raw message