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 2014/01/31 16:42:58 UTC
[9/9] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk
Conflicts:
build.xml
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9d41638a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9d41638a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9d41638a
Branch: refs/heads/trunk
Commit: 9d41638ab4ce9f49c5378c8a6b0eec10ddaec294
Parents: 5200d45 d76ad2e
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jan 31 09:40:48 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jan 31 09:40:48 2014 -0600
----------------------------------------------------------------------
debian/changelog | 6 ++++++
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
.../apache/cassandra/locator/DynamicEndpointSnitchTest.java | 2 +-
test/unit/org/apache/cassandra/service/InitClientTest.java | 2 +-
.../org/apache/cassandra/service/StorageServiceClientTest.java | 2 +-
5 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d41638a/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------