merged with upstream

This commit is contained in:
Jonas Bonér 2010-03-11 11:05:10 +01:00
commit dda8e515ca
9 changed files with 148 additions and 44 deletions

View file

@ -58,7 +58,7 @@ object RemoteNode extends RemoteServer
*/
object RemoteServer {
val HOSTNAME = config.getString("akka.remote.server.hostname", "localhost")
val PORT = config.getInt("akka.remote.server.port", 9966)
val PORT = config.getInt("akka.remote.server.port", 9999)
val CONNECTION_TIMEOUT_MILLIS = config.getInt("akka.remote.server.connection-timeout", 1000)