pekko/akka-remote/src
Patrik Nordwall c53d5e16e5 Merge branch 'master' into wip-1361-modularize-config-reference-patriknw
Conflicts:
	akka-actor/src/main/resources/akka-actor-reference.conf
	akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
	akka-actor/src/main/scala/akka/actor/ActorSystem.scala
	akka-remote/src/main/scala/akka/remote/Gossiper.scala
	akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
2011-11-24 14:56:19 +01:00
..
main Merge branch 'master' into wip-1361-modularize-config-reference-patriknw 2011-11-24 14:56:19 +01:00
multi-jvm/scala/akka/remote Modularize configuration. See #1361 2011-11-23 20:31:58 +01:00
test Modularize configuration. See #1361 2011-11-23 20:31:58 +01:00