Repository: james-project Updated Branches: refs/heads/master 238d1c799 -> f96adca8d
Revert "JAMES-2133 Avoid cassandra test containers to cluster together" This reverts commit 2c411e8b5bb8d304f5b2775f0e28e83e9ccf9859. Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f96adca8 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f96adca8 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f96adca8 Branch: refs/heads/master Commit: f96adca8d8d6abe7c59e71f7b97c358b2147606d Parents: 238d1c7 Author: Matthieu Baechler <matth...@apache.org> Authored: Tue Sep 12 10:36:01 2017 +0200 Committer: Matthieu Baechler <matth...@apache.org> Committed: Tue Sep 12 10:36:01 2017 +0200 ---------------------------------------------------------------------- .../org/apache/james/backends/cassandra/DockerCassandraRule.java | 4 ---- 1 file changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/f96adca8/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraRule.java ---------------------------------------------------------------------- diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraRule.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraRule.java index 67ce0b4..2579a14 100644 --- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraRule.java +++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraRule.java @@ -19,8 +19,6 @@ package org.apache.james.backends.cassandra; -import java.util.UUID; - import org.apache.commons.lang3.RandomStringUtils; import org.junit.rules.TestRule; import org.junit.runner.Description; @@ -82,8 +80,6 @@ public class DockerCassandraRule implements TestRule { .run("echo \"JVM_OPTS=\\\"\\$JVM_OPTS -Dcassandra.skip_wait_for_gossip_to_settle=0\\\"\" >> " + CASSANDRA_ENV) //make sure commit log disk flush won't happen .run("sed -i -e \"s/commitlog_sync_period_in_ms: 10000/commitlog_sync_period_in_ms: 9999999/\" " + CASSANDRA_YAML) - //Cassandra nodes should not cluster together - .run("sed -i -e \"s/cluster_name: 'Test Cluster'/cluster_name: 'Test Cluster " + UUID.randomUUID() + "'/\" " + CASSANDRA_YAML) //auto_bootstrap should be useless when no existing data .run("echo auto_bootstrap: false >> " + CASSANDRA_YAML) .run("echo \"-Xms1500M\" >> " + JVM_OPTIONS) --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
