You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2012/07/27 17:19:38 UTC
[14/50] [abbrv] git commit: merge from 1.1

merge from 1.1


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

Branch: refs/heads/cassandra-1.1
Commit: 5cde66bab30e7aa8f98bae9a7504b2a4a17cdda1
Parents: b167e9b cc0be1b
Author: Pavel Yaskevich <xe...@apache.org>
Authored: Wed Jul 25 22:01:14 2012 +0300
Committer: Pavel Yaskevich <xe...@apache.org>
Committed: Wed Jul 25 22:01:14 2012 +0300

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 .../org/apache/cassandra/db/ColumnFamilyStore.java |   33 +++++++++------
 .../cassandra/db/ColumnFamilyStoreMBean.java       |    5 ++
 .../compaction/SizeTieredCompactionStrategy.java   |    3 +-
 src/java/org/apache/cassandra/tools/NodeProbe.java |    3 +-
 .../cassandra/db/compaction/CompactionsTest.java   |    3 +-
 6 files changed, 29 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cde66ba/src/java/org/apache/cassandra/db/ColumnFamilyStoreMBean.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cde66ba/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cde66ba/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cde66ba/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
----------------------------------------------------------------------