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 2013/01/25 21:27:58 UTC
[3/9] git commit: Merge branch 'cassandra-1.2' of
https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2
Merge branch 'cassandra-1.2' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8540974d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8540974d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8540974d
Branch: refs/heads/trunk
Commit: 8540974dbd26989b1cd72608b06e57ebe053bf38
Parents: 88bdda7 cc8d160
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Jan 25 08:08:29 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Jan 25 08:08:29 2013 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/helptopics.py | 2 +-
.../db/compaction/AbstractCompactionStrategy.java | 4 +-
.../apache/cassandra/locator/TokenMetadata.java | 17 ++-
.../apache/cassandra/service/StorageService.java | 86 ++++++++++++---
.../org/apache/cassandra/streaming/StreamOut.java | 10 ++-
6 files changed, 96 insertions(+), 24 deletions(-)
----------------------------------------------------------------------