From da5a5d1316aa5ed7072340593f32413ba9dfc177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Bone=CC=81r?= Date: Tue, 28 Feb 2012 10:53:28 +0100 Subject: [PATCH] Added ensime files to .gitignore. Plus fixed error from merge. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jonas Bonér --- .gitignore | 3 +-- .../src/main/scala/akka/cluster/ClusterSettings.scala | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 25d3fa2323..7d8723dcb9 100755 --- a/.gitignore +++ b/.gitignore @@ -24,8 +24,7 @@ logs .#* .codefellow storage -.codefellow -.ensime +.ensime* _dump .manager manifest.mf diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala index 10f0316476..e05c04b9d7 100644 --- a/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala +++ b/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala @@ -16,8 +16,8 @@ class ClusterSettings(val config: Config, val systemName: String) { val FailureDetectorThreshold = getInt("akka.cluster.failure-detector.threshold") val FailureDetectorMaxSampleSize = getInt("akka.cluster.failure-detector.max-sample-size") val NodeToJoin: Option[Address] = getString("akka.cluster.node-to-join") match { - case "" ⇒ None - case AddressExtractor(addr) ⇒ Some(addr) + case "" ⇒ None + case AddressFromURIString(addr) ⇒ Some(addr) } val GossipInitialDelay = Duration(getMilliseconds("akka.cluster.gossip.initialDelay"), MILLISECONDS) val GossipFrequency = Duration(getMilliseconds("akka.cluster.gossip.frequency"), MILLISECONDS)