raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Merge branch 'master' into wip-2219-seed-nodes-patriknw

Browse source 
Conflicts:
	akka-cluster/src/main/scala/akka/cluster/AccrualFailureDetector.scala
	akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala
This commit is contained in:
Patrik Nordwall 2012-06-25 20:40:06 +02:00
commit 20fc0c42a2
56 changed files with 1323 additions and 490 deletions
Download patch file Download diff file Expand all files Collapse all files

3
akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala
View file

@ -22,12 +22,13 @@ class ClusterConfigSpec extends AkkaSpec {
FailureDetectorMinStdDeviation must be(100 millis)
FailureDetectorAcceptableHeartbeatPause must be(3 seconds)
SeedNodes must be(Seq.empty[String])
JoinSeedNodeTimeout must be(5 seconds)
SeedNodeTimeout must be(5 seconds)
PeriodicTasksInitialDelay must be(1 seconds)
GossipInterval must be(1 second)
HeartbeatInterval must be(1 second)
LeaderActionsInterval must be(1 second)
UnreachableNodesReaperInterval must be(1 second)
JoinTimeout must be(60 seconds)
NrOfGossipDaemons must be(4)
AutoJoin must be(true)
AutoDown must be(true)