Merge branch 'master' into wip-2230-race-in-test-conductor-shutdown-ban

2012-06-25 15:56:25 +02:00 · 2012-06-25 15:56:25 +02:00 · de7a14ee01
commit de7a14ee01
parent e2037e254b 66bcca8a91
1 changed files with 2 additions and 0 deletions
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/SunnyWeatherSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/SunnyWeatherSpec.scala
@ -24,6 +24,8 @@ object SunnyWeatherMultiJvmSpec extends MultiNodeConfig {
  commonConfig(ConfigFactory.parseString("""
    akka.cluster {
      nr-of-deputy-nodes = 0
+      # FIXME remove this (use default) when ticket #2239 has been fixed
+      gossip-interval = 400 ms
    }
    akka.loglevel = INFO
    """))