You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2012/02/09 14:40:10 UTC
[3/4] git commit: Merge branch 'cassandra-1.1' of
https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.1
Merge branch 'cassandra-1.1' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/db3f9083
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db3f9083
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/db3f9083
Branch: refs/heads/trunk
Commit: db3f9083ab5e3dac8ea84271d06c12011e3d20aa
Parents: a85bbdf 6ab5a08
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Feb 9 09:03:05 2012 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Feb 9 09:03:05 2012 +0100
----------------------------------------------------------------------
CHANGES.txt | 5 +
.../org/apache/cassandra/config/CFMetaData.java | 8 ++
src/java/org/apache/cassandra/cql/CFPropDefs.java | 7 ++-
src/java/org/apache/cassandra/cql3/CFPropDefs.java | 7 ++-
.../org/apache/cassandra/db/ColumnFamilyStore.java | 21 +++---
src/java/org/apache/cassandra/db/Table.java | 2 +-
.../cassandra/db/compaction/CompactionTask.java | 2 +-
.../io/compress/CompressionParameters.java | 2 +-
.../apache/cassandra/service/StorageService.java | 58 ++++++++-------
.../cassandra/service/StorageServiceMBean.java | 9 ++
src/java/org/apache/cassandra/tools/NodeCmd.java | 16 ++++
src/java/org/apache/cassandra/tools/NodeProbe.java | 6 ++
.../org/apache/cassandra/utils/FBUtilities.java | 7 +-
13 files changed, 104 insertions(+), 46 deletions(-)
----------------------------------------------------------------------