cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-1.2' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2
Date Fri, 25 Jan 2013 07:09:06 GMT
Updated Branches:
  refs/heads/cassandra-1.2 cc8d16023 -> 8540974db


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/cassandra-1.2
Commit: 8540974dbd26989b1cd72608b06e57ebe053bf38
Parents: 88bdda7 cc8d160
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Jan 25 08:08:29 2013 +0100
Committer: Sylvain Lebresne <sylvain@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(-)
----------------------------------------------------------------------



Mime
View raw message