Merge master into tame-globals branch

This commit is contained in:
Peter Vlugter 2011-10-13 13:41:44 +02:00
commit 317b8bc03b
60 changed files with 2079 additions and 1696 deletions

View file

@ -21,7 +21,7 @@ class ConfiguredLocalRoutingSpec extends AkkaSpec {
None,
RoundRobin,
NrOfInstances(5),
RemoveConnectionOnFirstFailureLocalFailureDetector,
NoOpFailureDetector,
LocalScope))
val helloLatch = new CountDownLatch(5)
@ -57,7 +57,7 @@ class ConfiguredLocalRoutingSpec extends AkkaSpec {
None,
RoundRobin,
NrOfInstances(10),
RemoveConnectionOnFirstFailureLocalFailureDetector,
NoOpFailureDetector,
LocalScope))
val connectionCount = 10
@ -102,7 +102,7 @@ class ConfiguredLocalRoutingSpec extends AkkaSpec {
None,
RoundRobin,
NrOfInstances(5),
RemoveConnectionOnFirstFailureLocalFailureDetector,
NoOpFailureDetector,
LocalScope))
val helloLatch = new CountDownLatch(5)
@ -137,7 +137,7 @@ class ConfiguredLocalRoutingSpec extends AkkaSpec {
None,
Random,
NrOfInstances(7),
RemoveConnectionOnFirstFailureLocalFailureDetector,
NoOpFailureDetector,
LocalScope))
val stopLatch = new CountDownLatch(7)
@ -171,7 +171,7 @@ class ConfiguredLocalRoutingSpec extends AkkaSpec {
None,
Random,
NrOfInstances(10),
RemoveConnectionOnFirstFailureLocalFailureDetector,
NoOpFailureDetector,
LocalScope))
val connectionCount = 10
@ -216,7 +216,7 @@ class ConfiguredLocalRoutingSpec extends AkkaSpec {
None,
Random,
NrOfInstances(6),
RemoveConnectionOnFirstFailureLocalFailureDetector,
NoOpFailureDetector,
LocalScope))
val helloLatch = new CountDownLatch(6)