cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [06/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Wed, 02 Dec 2015 13:22:59 GMT
Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 29ed6fe2ed214b4415ae8d1581579757d44b89c4
Parents: 9f19dd4 5175326
Author: Sam Tunnicliffe <sam@beobal.com>
Authored: Wed Dec 2 13:11:53 2015 +0000
Committer: Sam Tunnicliffe <sam@beobal.com>
Committed: Wed Dec 2 13:14:53 2015 +0000

----------------------------------------------------------------------
 src/java/org/apache/cassandra/gms/Gossiper.java | 21 +++++++++++++++-----
 .../cassandra/locator/PropertyFileSnitch.java   |  7 ++-----
 .../cassandra/service/MigrationManager.java     |  4 ++--
 .../apache/cassandra/service/StorageProxy.java  |  8 ++++----
 .../cassandra/service/StorageService.java       | 12 +++++------
 5 files changed, 30 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/29ed6fe2/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/29ed6fe2/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/locator/PropertyFileSnitch.java
index 8843b77,dc9a3b8..bfd8e8e
--- a/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java
+++ b/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java
@@@ -32,8 -31,7 +31,6 @@@ import org.slf4j.Logger
  import org.slf4j.LoggerFactory;
  
  import org.apache.cassandra.exceptions.ConfigurationException;
- import org.apache.cassandra.gms.Gossiper;
--import org.apache.cassandra.io.util.FileUtils;
  import org.apache.cassandra.service.StorageService;
  import org.apache.cassandra.utils.FBUtilities;
  import org.apache.cassandra.utils.ResourceWatcher;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/29ed6fe2/src/java/org/apache/cassandra/service/MigrationManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/29ed6fe2/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/29ed6fe2/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------


Mime
View raw message