cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Date Mon, 07 Oct 2013 20:33:30 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/a5798165
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a5798165
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a5798165

Branch: refs/heads/trunk
Commit: a57981650453470d6ee204329edf0dd5d008d18e
Parents: 558a9e5 a2b1278
Author: Yuki Morishita <yukim@apache.org>
Authored: Mon Oct 7 15:33:17 2013 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Mon Oct 7 15:33:17 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 NEWS.txt                                        |  3 +
 .../org/apache/cassandra/config/CFMetaData.java | 11 +++
 .../org/apache/cassandra/config/KSMetaData.java |  1 +
 .../org/apache/cassandra/db/SystemKeyspace.java | 25 ++++++
 .../CompactionHistoryTabularData.java           | 84 ++++++++++++++++++++
 .../db/compaction/CompactionManager.java        | 14 ++++
 .../db/compaction/CompactionManagerMBean.java   |  4 +
 .../cassandra/db/compaction/CompactionTask.java | 52 ++++++------
 .../org/apache/cassandra/tools/NodeCmd.java     | 26 ++++++
 .../org/apache/cassandra/tools/NodeProbe.java   |  6 ++
 .../apache/cassandra/tools/NodeToolHelp.yaml    |  3 +
 12 files changed, 204 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a5798165/NEWS.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a5798165/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a5798165/src/java/org/apache/cassandra/db/SystemKeyspace.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a5798165/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a5798165/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
----------------------------------------------------------------------


Mime
View raw message