Skip to content

Commit

Permalink
Scalastyle.
Browse files Browse the repository at this point in the history
  • Loading branch information
Marcelo Vanzin committed Apr 3, 2015
1 parent c671c46 commit 6b73fcb
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions core/src/main/scala/org/apache/spark/SparkContext.scala
Expand Up @@ -240,18 +240,18 @@ class SparkContext(config: SparkConf) extends Logging with ExecutorAllocationCli

def jars: Seq[String] = _jars
def files: Seq[String] = _files
def master = _conf.get("spark.master")
def appName = _conf.get("spark.app.name")
def master: String = _conf.get("spark.master")
def appName: String = _conf.get("spark.app.name")

private[spark] def isEventLogEnabled = _conf.getBoolean("spark.eventLog.enabled", false)
private[spark] def isEventLogEnabled: Boolean = _conf.getBoolean("spark.eventLog.enabled", false)
private[spark] def eventLogDir: Option[String] = _eventLogDir
private[spark] def eventLogCodec: Option[String] = _eventLogCodec

// Generate the random name for a temp folder in Tachyon
// Add a timestamp as the suffix here to make it more safe
val tachyonFolderName = "spark-" + randomUUID.toString()

def isLocal = (master == "local" || master.startsWith("local["))
def isLocal: Boolean = (master == "local" || master.startsWith("local["))

// An asynchronous listener bus for Spark events
private[spark] val listenerBus = new LiveListenerBus
Expand Down

0 comments on commit 6b73fcb

Please sign in to comment.