cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject [41/50] git commit: Merge branch 'cassandra-1.1' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.1
Date Tue, 14 Feb 2012 18:52:14 GMT
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/cassandra-1.0
Commit: db3f9083ab5e3dac8ea84271d06c12011e3d20aa
Parents: a85bbdf 6ab5a08
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Thu Feb 9 09:03:05 2012 +0100
Committer: Sylvain Lebresne <sylvain@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(-)
----------------------------------------------------------------------



Mime
View raw message