cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [05/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Date Tue, 08 Apr 2014 19:46:43 GMT
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java


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

Branch: refs/heads/cassandra-2.1
Commit: c17dcd484aeebfca805f37bd47b504cda6ef4078
Parents: a421551 97a6e36
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Tue Apr 8 14:42:31 2014 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Tue Apr 8 14:42:31 2014 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/StorageService.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c17dcd48/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 2406603,a7541f4..1c4fd27
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -1380,25 -1360,24 +1380,24 @@@ public class StorageService extends Not
              switch (state)
              {
                  case RELEASE_VERSION:
 -                    SystemTable.updatePeerInfo(endpoint, "release_version", quote(value.value));
 +                    SystemKeyspace.updatePeerInfo(endpoint, "release_version", quote(value.value));
                      break;
                  case DC:
 -                    SystemTable.updatePeerInfo(endpoint, "data_center", quote(value.value));
 +                    SystemKeyspace.updatePeerInfo(endpoint, "data_center", quote(value.value));
                      break;
                  case RACK:
 -                    SystemTable.updatePeerInfo(endpoint, "rack", quote(value.value));
 +                    SystemKeyspace.updatePeerInfo(endpoint, "rack", quote(value.value));
                      break;
                  case RPC_ADDRESS:
 -                    SystemTable.updatePeerInfo(endpoint, "rpc_address", quote(value.value));
 +                    SystemKeyspace.updatePeerInfo(endpoint, "rpc_address", quote(value.value));
                      break;
                  case SCHEMA:
 -                    SystemTable.updatePeerInfo(endpoint, "schema_version", value.value);
 +                    SystemKeyspace.updatePeerInfo(endpoint, "schema_version", value.value);
+                     MigrationManager.instance.scheduleSchemaPull(endpoint, epState);
                      break;
                  case HOST_ID:
 -                    SystemTable.updatePeerInfo(endpoint, "host_id", value.value);
 +                    SystemKeyspace.updatePeerInfo(endpoint, "host_id", value.value);
                      break;
-                 case SCHEMA:
-                     MigrationManager.instance.scheduleSchemaPull(endpoint, epState);
              }
          }
      }


Mime
View raw message