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:50 UTC
[1/9] git commit: ocd
Updated Branches:
refs/heads/cassandra-1.2 52e1def7a -> 5f6c5ce68
refs/heads/cassandra-2.0 bcb294de0 -> d76ad2e24
refs/heads/trunk 5200d45a9 -> 9d41638ab
ocd
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/52e1def7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/52e1def7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/52e1def7
Branch: refs/heads/trunk
Commit: 52e1def7a2e1870ad3999b4eeaaa62ee5c9a2a40
Parents: df86e8f
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jan 31 06:47:18 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jan 31 06:47:18 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/52e1def7/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 c93ea5b..c4b1b2e 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1491,7 +1491,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
}
else
{
- logger.warn("Host ID Collision for {} between {} and {}; ignored {}", hostId, existing, endpoint, endpoint);
+ logger.warn("Host ID collision for {} between {} and {}; ignored {}", hostId, existing, endpoint, endpoint);
tokenMetadata.removeEndpoint(endpoint);
endpointsToRemove.add(endpoint);
}
[4/9] git commit: fix fat client tests
Posted by br...@apache.org.
fix fat client tests
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5f6c5ce6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f6c5ce6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f6c5ce6
Branch: refs/heads/cassandra-1.2
Commit: 5f6c5ce68f53e8943a171679f595e99ff06afa49
Parents: 52e1def
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jan 31 09:40:06 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jan 31 09:40:06 2014 -0600
----------------------------------------------------------------------
.../org/apache/cassandra/locator/DynamicEndpointSnitchTest.java | 2 +-
test/unit/org/apache/cassandra/service/InitClientTest.java | 2 +-
.../org/apache/cassandra/service/StorageServiceClientTest.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f6c5ce6/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java b/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
index 3ac9ecb..298f1c7 100644
--- a/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
+++ b/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
@@ -35,7 +35,7 @@ public class DynamicEndpointSnitchTest
public void testSnitch() throws InterruptedException, IOException, ConfigurationException
{
// do this because SS needs to be initialized before DES can work properly.
- StorageService.instance.initClient();
+ StorageService.instance.initClient(0);
int sleeptime = 150;
SimpleSnitch ss = new SimpleSnitch();
DynamicEndpointSnitch dsnitch = new DynamicEndpointSnitch(ss, String.valueOf(ss.hashCode()));
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f6c5ce6/test/unit/org/apache/cassandra/service/InitClientTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/service/InitClientTest.java b/test/unit/org/apache/cassandra/service/InitClientTest.java
index 23c4b1c..7d44cd8 100644
--- a/test/unit/org/apache/cassandra/service/InitClientTest.java
+++ b/test/unit/org/apache/cassandra/service/InitClientTest.java
@@ -30,6 +30,6 @@ public class InitClientTest // extends CleanupHelper
@Test
public void testInitClientStartup() throws IOException, ConfigurationException
{
- StorageService.instance.initClient();
+ StorageService.instance.initClient(0);
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f6c5ce6/test/unit/org/apache/cassandra/service/StorageServiceClientTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/service/StorageServiceClientTest.java b/test/unit/org/apache/cassandra/service/StorageServiceClientTest.java
index b473c18..19efe3a 100644
--- a/test/unit/org/apache/cassandra/service/StorageServiceClientTest.java
+++ b/test/unit/org/apache/cassandra/service/StorageServiceClientTest.java
@@ -35,7 +35,7 @@ public class StorageServiceClientTest
{
SchemaLoader.mkdirs();
SchemaLoader.cleanup();
- StorageService.instance.initClient();
+ StorageService.instance.initClient(0);
// verify that no storage directories were created.
for (String path : DatabaseDescriptor.getAllDataFileLocations())
[9/9] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by br...@apache.org.
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
----------------------------------------------------------------------
[3/9] git commit: Update version for 2.0.5 release
Posted by br...@apache.org.
Update version for 2.0.5 release
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bcb294de
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bcb294de
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bcb294de
Branch: refs/heads/trunk
Commit: bcb294de088720890cfb8fe28365b055692979a5
Parents: 64a3e72
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Jan 31 16:06:12 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Jan 31 16:06:12 2014 +0100
----------------------------------------------------------------------
build.xml | 2 +-
debian/changelog | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcb294de/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 96a5d5e..65d6b8c 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
<property name="debuglevel" value="source,lines,vars"/>
<!-- default version and SCM information -->
- <property name="base.version" value="2.0.4"/>
+ <property name="base.version" value="2.0.5"/>
<property name="scm.connection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.developerConnection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.url" value="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcb294de/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 7e9d7a3..0dd17d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.0.5) unstable; urgency=low
+
+ * New release
+
+ -- Sylvain Lebresne <sl...@apache.org> Fri, 31 Jan 2014 16:05:20 +0100
+
cassandra (2.0.4) unstable; urgency=medium
* New release
[8/9] 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
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d76ad2e2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d76ad2e2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d76ad2e2
Branch: refs/heads/cassandra-2.0
Commit: d76ad2e2443d1884473c845ab77d69025560d03c
Parents: bcb294d 5f6c5ce
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jan 31 09:40:17 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jan 31 09:40:17 2014 -0600
----------------------------------------------------------------------
.../org/apache/cassandra/locator/DynamicEndpointSnitchTest.java | 2 +-
test/unit/org/apache/cassandra/service/InitClientTest.java | 2 +-
.../org/apache/cassandra/service/StorageServiceClientTest.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d76ad2e2/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
----------------------------------------------------------------------
[2/9] 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
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/64a3e726
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/64a3e726
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/64a3e726
Branch: refs/heads/trunk
Commit: 64a3e7265b77c41408f8eafaccc3ef093c39eadd
Parents: f6a7a5b 52e1def
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jan 31 06:47:28 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jan 31 06:47:28 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/64a3e726/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[6/9] git commit: fix fat client tests
Posted by br...@apache.org.
fix fat client tests
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5f6c5ce6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f6c5ce6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f6c5ce6
Branch: refs/heads/cassandra-2.0
Commit: 5f6c5ce68f53e8943a171679f595e99ff06afa49
Parents: 52e1def
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jan 31 09:40:06 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jan 31 09:40:06 2014 -0600
----------------------------------------------------------------------
.../org/apache/cassandra/locator/DynamicEndpointSnitchTest.java | 2 +-
test/unit/org/apache/cassandra/service/InitClientTest.java | 2 +-
.../org/apache/cassandra/service/StorageServiceClientTest.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f6c5ce6/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java b/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
index 3ac9ecb..298f1c7 100644
--- a/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
+++ b/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
@@ -35,7 +35,7 @@ public class DynamicEndpointSnitchTest
public void testSnitch() throws InterruptedException, IOException, ConfigurationException
{
// do this because SS needs to be initialized before DES can work properly.
- StorageService.instance.initClient();
+ StorageService.instance.initClient(0);
int sleeptime = 150;
SimpleSnitch ss = new SimpleSnitch();
DynamicEndpointSnitch dsnitch = new DynamicEndpointSnitch(ss, String.valueOf(ss.hashCode()));
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f6c5ce6/test/unit/org/apache/cassandra/service/InitClientTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/service/InitClientTest.java b/test/unit/org/apache/cassandra/service/InitClientTest.java
index 23c4b1c..7d44cd8 100644
--- a/test/unit/org/apache/cassandra/service/InitClientTest.java
+++ b/test/unit/org/apache/cassandra/service/InitClientTest.java
@@ -30,6 +30,6 @@ public class InitClientTest // extends CleanupHelper
@Test
public void testInitClientStartup() throws IOException, ConfigurationException
{
- StorageService.instance.initClient();
+ StorageService.instance.initClient(0);
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f6c5ce6/test/unit/org/apache/cassandra/service/StorageServiceClientTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/service/StorageServiceClientTest.java b/test/unit/org/apache/cassandra/service/StorageServiceClientTest.java
index b473c18..19efe3a 100644
--- a/test/unit/org/apache/cassandra/service/StorageServiceClientTest.java
+++ b/test/unit/org/apache/cassandra/service/StorageServiceClientTest.java
@@ -35,7 +35,7 @@ public class StorageServiceClientTest
{
SchemaLoader.mkdirs();
SchemaLoader.cleanup();
- StorageService.instance.initClient();
+ StorageService.instance.initClient(0);
// verify that no storage directories were created.
for (String path : DatabaseDescriptor.getAllDataFileLocations())
[5/9] git commit: fix fat client tests
Posted by br...@apache.org.
fix fat client tests
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5f6c5ce6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f6c5ce6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f6c5ce6
Branch: refs/heads/trunk
Commit: 5f6c5ce68f53e8943a171679f595e99ff06afa49
Parents: 52e1def
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jan 31 09:40:06 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jan 31 09:40:06 2014 -0600
----------------------------------------------------------------------
.../org/apache/cassandra/locator/DynamicEndpointSnitchTest.java | 2 +-
test/unit/org/apache/cassandra/service/InitClientTest.java | 2 +-
.../org/apache/cassandra/service/StorageServiceClientTest.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f6c5ce6/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java b/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
index 3ac9ecb..298f1c7 100644
--- a/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
+++ b/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
@@ -35,7 +35,7 @@ public class DynamicEndpointSnitchTest
public void testSnitch() throws InterruptedException, IOException, ConfigurationException
{
// do this because SS needs to be initialized before DES can work properly.
- StorageService.instance.initClient();
+ StorageService.instance.initClient(0);
int sleeptime = 150;
SimpleSnitch ss = new SimpleSnitch();
DynamicEndpointSnitch dsnitch = new DynamicEndpointSnitch(ss, String.valueOf(ss.hashCode()));
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f6c5ce6/test/unit/org/apache/cassandra/service/InitClientTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/service/InitClientTest.java b/test/unit/org/apache/cassandra/service/InitClientTest.java
index 23c4b1c..7d44cd8 100644
--- a/test/unit/org/apache/cassandra/service/InitClientTest.java
+++ b/test/unit/org/apache/cassandra/service/InitClientTest.java
@@ -30,6 +30,6 @@ public class InitClientTest // extends CleanupHelper
@Test
public void testInitClientStartup() throws IOException, ConfigurationException
{
- StorageService.instance.initClient();
+ StorageService.instance.initClient(0);
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f6c5ce6/test/unit/org/apache/cassandra/service/StorageServiceClientTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/service/StorageServiceClientTest.java b/test/unit/org/apache/cassandra/service/StorageServiceClientTest.java
index b473c18..19efe3a 100644
--- a/test/unit/org/apache/cassandra/service/StorageServiceClientTest.java
+++ b/test/unit/org/apache/cassandra/service/StorageServiceClientTest.java
@@ -35,7 +35,7 @@ public class StorageServiceClientTest
{
SchemaLoader.mkdirs();
SchemaLoader.cleanup();
- StorageService.instance.initClient();
+ StorageService.instance.initClient(0);
// verify that no storage directories were created.
for (String path : DatabaseDescriptor.getAllDataFileLocations())
[7/9] 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
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d76ad2e2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d76ad2e2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d76ad2e2
Branch: refs/heads/trunk
Commit: d76ad2e2443d1884473c845ab77d69025560d03c
Parents: bcb294d 5f6c5ce
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jan 31 09:40:17 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jan 31 09:40:17 2014 -0600
----------------------------------------------------------------------
.../org/apache/cassandra/locator/DynamicEndpointSnitchTest.java | 2 +-
test/unit/org/apache/cassandra/service/InitClientTest.java | 2 +-
.../org/apache/cassandra/service/StorageServiceClientTest.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d76ad2e2/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
----------------------------------------------------------------------