raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Added ensime files to .gitignore. Plus fixed error from merge.

Browse source 
Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
This commit is contained in:
Jonas Bonér 2012-02-28 10:53:28 +01:00
parent a62755c5da
commit da5a5d1316
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -24,8 +24,7 @@ logs
.#*
.codefellow
storage
.codefellow
.ensime
.ensime*
_dump
.manager
manifest.mf

4
akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala
View file

@ -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)