Endre Sándor Varga 55be17419e Merge branch 'master' into wip-2053d-actorbased-remote-drewhk ... Conflicts: akka-docs/rst/java/code/docs/serialization/SerializationDocTestBase.java akka-docs/rst/scala/code/docs/serialization/SerializationDocSpec.scala akka-remote-tests/src/main/scala/akka/remote/testconductor/NetworkFailureInjector.scala akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala		2012-12-18 15:15:01 +01:00
..
resources	min-nr-of-members and registerOnMemberUp, see #2306	2012-12-12 14:00:06 +01:00
scala/akka/cluster	Merge branch 'master' into wip-2053d-actorbased-remote-drewhk	2012-12-18 15:15:01 +01:00