You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/10/29 21:41:40 UTC

[11/11] git commit: Merge remote-tracking branch 'origin/trunk' into trunk

Merge remote-tracking branch 'origin/trunk' into trunk


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

Branch: refs/heads/trunk
Commit: ba3c1bcb9350a09f23e224ab0201048b00768a03
Parents: 9e2ccc1 43d3b35
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Oct 29 15:41:23 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Oct 29 15:41:23 2013 -0500

----------------------------------------------------------------------
 NEWS.txt                                        |  7 ++++++
 src/java/org/apache/cassandra/gms/Gossiper.java | 24 ++++++++++++++++----
 .../gms/IEndpointStateChangeSubscriber.java     |  2 ++
 .../apache/cassandra/gms/VersionedValue.java    |  5 ++++
 .../locator/ReconnectableSnitchHelper.java      |  5 ++++
 .../apache/cassandra/repair/RepairSession.java  |  1 +
 .../cassandra/service/LoadBroadcaster.java      |  2 ++
 .../cassandra/service/MigrationManager.java     |  3 +++
 .../cassandra/service/StorageService.java       |  7 +++++-
 .../cassandra/streaming/StreamSession.java      |  1 +
 10 files changed, 52 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba3c1bcb/NEWS.txt
----------------------------------------------------------------------