Merging in master

2012-07-04 15:24:23 +02:00 · 2012-07-04 15:24:23 +02:00 · 3911b18069
commit 3911b18069
parent 6fb06ee46b eec6ba099b
25 changed files with 285 additions and 239 deletions
--- a/akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala
@ -33,7 +33,7 @@ class ClusterConfigSpec extends AkkaSpec {
      JoinTimeout must be(60 seconds)
      NrOfGossipDaemons must be(4)
      AutoJoin must be(true)
-      AutoDown must be(true)
+      AutoDown must be(false)
      GossipDifferentViewProbability must be(0.8 plusOrMinus 0.0001)
      SchedulerTickDuration must be(33 millis)
      SchedulerTicksPerWheel must be(512)