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

Merge branch 'master' into wip-2202-cluster-domain-events-patriknw

Browse source 
Conflicts:
	akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala
This commit is contained in:
Patrik Nordwall 2012-08-16 18:54:10 +02:00
commit 1700edb863
27 changed files with 336 additions and 378 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala
View file

@ -22,7 +22,7 @@ import akka.actor.RootActorPath
object MultiNodeClusterSpec {
def clusterConfig: Config = ConfigFactory.parseString("""
akka.cluster {
auto-join = off
auto-join = on
auto-down = off
gossip-interval = 200 ms
heartbeat-interval = 400 ms