Merge branch 'master' into wip-2162-membership-change-listener-spec-jboner

Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
2012-06-04 23:32:27 +02:00 · 2012-06-04 23:32:27 +02:00 · 4acee03195
commit 4acee03195
parent 391fed6594 b98fb0e37a
28 changed files with 591 additions and 121 deletions
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinTwoClustersSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinTwoClustersSpec.scala
@ -78,7 +78,6 @@ abstract class JoinTwoClustersSpec
      assertLeader(c1, c2)

      testConductor.enter("four-members")
-
    }

    "be able to 'elect' a single leader after joining (C -> A + B)" taggedAs LongRunningTest in {
@ -94,5 +93,4 @@ abstract class JoinTwoClustersSpec
      testConductor.enter("six-members")
    }
  }
-
 }