Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7C1A3118C0 for ; Tue, 8 Apr 2014 19:46:47 +0000 (UTC) Received: (qmail 78350 invoked by uid 500); 8 Apr 2014 19:46:46 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 78294 invoked by uid 500); 8 Apr 2014 19:46:45 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 77062 invoked by uid 99); 8 Apr 2014 19:46:39 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Apr 2014 19:46:39 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 97EBA94E70A; Tue, 8 Apr 2014 19:46:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org Date: Tue, 08 Apr 2014 19:46:44 -0000 Message-Id: <7672c54636e447fa9f8fdfe044cf7798@git.apache.org> In-Reply-To: <32a5cb5fd91c47549cab6a8f3092c9d8@git.apache.org> References: <32a5cb5fd91c47549cab6a8f3092c9d8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [06/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0 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.0 Commit: c17dcd484aeebfca805f37bd47b504cda6ef4078 Parents: a421551 97a6e36 Author: Brandon Williams Authored: Tue Apr 8 14:42:31 2014 -0500 Committer: Brandon Williams 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); } } }