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/04/08 21:46:39 UTC
[01/10] git commit: fix broken build
Repository: cassandra
Updated Branches:
refs/heads/cassandra-1.2 1755f65a6 -> 97a6e36bc
refs/heads/cassandra-2.0 a421551d1 -> c17dcd484
refs/heads/cassandra-2.1 ffc8dae6d -> da2acdd60
refs/heads/trunk 05a457574 -> e1e91bebd
fix broken build
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/97a6e36b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/97a6e36b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/97a6e36b
Branch: refs/heads/cassandra-1.2
Commit: 97a6e36bcdb6e186c07acac8ab9baaafd37d43ad
Parents: 1755f65
Author: Brandon Williams <br...@apache.org>
Authored: Tue Apr 8 14:42:04 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Apr 8 14:42:04 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/97a6e36b/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 473ef49..a7541f4 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1373,12 +1373,11 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
break;
case SCHEMA:
SystemTable.updatePeerInfo(endpoint, "schema_version", value.value);
+ MigrationManager.instance.scheduleSchemaPull(endpoint, epState);
break;
case HOST_ID:
SystemTable.updatePeerInfo(endpoint, "host_id", value.value);
break;
- case SCHEMA:
- MigrationManager.instance.scheduleSchemaPull(endpoint, epState);
}
}
}
[06/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
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 <br...@apache.org>
Authored: Tue Apr 8 14:42:31 2014 -0500
Committer: Brandon Williams <br...@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);
}
}
}
[10/10] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e1e91beb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e1e91beb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e1e91beb
Branch: refs/heads/trunk
Commit: e1e91bebdf4a2aa457d53b3a1c5c95b252b4f98b
Parents: 05a4575 da2acdd
Author: Brandon Williams <br...@apache.org>
Authored: Tue Apr 8 14:42:52 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Apr 8 14:42:52 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/e1e91beb/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[02/10] git commit: fix broken build
Posted by br...@apache.org.
fix broken build
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/97a6e36b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/97a6e36b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/97a6e36b
Branch: refs/heads/cassandra-2.0
Commit: 97a6e36bcdb6e186c07acac8ab9baaafd37d43ad
Parents: 1755f65
Author: Brandon Williams <br...@apache.org>
Authored: Tue Apr 8 14:42:04 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Apr 8 14:42:04 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/97a6e36b/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 473ef49..a7541f4 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1373,12 +1373,11 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
break;
case SCHEMA:
SystemTable.updatePeerInfo(endpoint, "schema_version", value.value);
+ MigrationManager.instance.scheduleSchemaPull(endpoint, epState);
break;
case HOST_ID:
SystemTable.updatePeerInfo(endpoint, "host_id", value.value);
break;
- case SCHEMA:
- MigrationManager.instance.scheduleSchemaPull(endpoint, epState);
}
}
}
[08/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/da2acdd6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/da2acdd6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/da2acdd6
Branch: refs/heads/cassandra-2.1
Commit: da2acdd606fca0952ee74d629a5876cfba58b784
Parents: ffc8dae c17dcd4
Author: Brandon Williams <br...@apache.org>
Authored: Tue Apr 8 14:42:43 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Apr 8 14:42:43 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/da2acdd6/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/da2acdd6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/da2acdd6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/da2acdd6
Branch: refs/heads/trunk
Commit: da2acdd606fca0952ee74d629a5876cfba58b784
Parents: ffc8dae c17dcd4
Author: Brandon Williams <br...@apache.org>
Authored: Tue Apr 8 14:42:43 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Apr 8 14:42:43 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/da2acdd6/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[04/10] git commit: fix broken build
Posted by br...@apache.org.
fix broken build
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/97a6e36b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/97a6e36b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/97a6e36b
Branch: refs/heads/trunk
Commit: 97a6e36bcdb6e186c07acac8ab9baaafd37d43ad
Parents: 1755f65
Author: Brandon Williams <br...@apache.org>
Authored: Tue Apr 8 14:42:04 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Apr 8 14:42:04 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/97a6e36b/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 473ef49..a7541f4 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1373,12 +1373,11 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
break;
case SCHEMA:
SystemTable.updatePeerInfo(endpoint, "schema_version", value.value);
+ MigrationManager.instance.scheduleSchemaPull(endpoint, epState);
break;
case HOST_ID:
SystemTable.updatePeerInfo(endpoint, "host_id", value.value);
break;
- case SCHEMA:
- MigrationManager.instance.scheduleSchemaPull(endpoint, epState);
}
}
}
[03/10] git commit: fix broken build
Posted by br...@apache.org.
fix broken build
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/97a6e36b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/97a6e36b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/97a6e36b
Branch: refs/heads/cassandra-2.1
Commit: 97a6e36bcdb6e186c07acac8ab9baaafd37d43ad
Parents: 1755f65
Author: Brandon Williams <br...@apache.org>
Authored: Tue Apr 8 14:42:04 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Apr 8 14:42:04 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/97a6e36b/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 473ef49..a7541f4 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1373,12 +1373,11 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
break;
case SCHEMA:
SystemTable.updatePeerInfo(endpoint, "schema_version", value.value);
+ MigrationManager.instance.scheduleSchemaPull(endpoint, epState);
break;
case HOST_ID:
SystemTable.updatePeerInfo(endpoint, "host_id", value.value);
break;
- case SCHEMA:
- MigrationManager.instance.scheduleSchemaPull(endpoint, epState);
}
}
}
[07/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
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/trunk
Commit: c17dcd484aeebfca805f37bd47b504cda6ef4078
Parents: a421551 97a6e36
Author: Brandon Williams <br...@apache.org>
Authored: Tue Apr 8 14:42:31 2014 -0500
Committer: Brandon Williams <br...@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);
}
}
}
[05/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
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 <br...@apache.org>
Authored: Tue Apr 8 14:42:31 2014 -0500
Committer: Brandon Williams <br...@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);
}
}
}