aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorAli Ghodsi <alig@cs.berkeley.edu>2013-09-02 19:33:55 -0700
committerAli Ghodsi <alig@cs.berkeley.edu>2013-09-02 19:33:55 -0700
commitcbfef9b3ffadbdb8e39d092a97090de5ffd7c1dd (patch)
tree9f096194347b2f1f3a81d1e6dcc41502867fe0a1 /core
parent36d8fca2cca7cb3f8c490631b0f6699a119e1230 (diff)
downloadspark-cbfef9b3ffadbdb8e39d092a97090de5ffd7c1dd.tar.gz
spark-cbfef9b3ffadbdb8e39d092a97090de5ffd7c1dd.tar.bz2
spark-cbfef9b3ffadbdb8e39d092a97090de5ffd7c1dd.zip
Sort order of imports to match project guidelines
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/org/apache/spark/deploy/master/Master.scala10
1 files changed, 5 insertions, 5 deletions
diff --git a/core/src/main/scala/org/apache/spark/deploy/master/Master.scala b/core/src/main/scala/org/apache/spark/deploy/master/Master.scala
index dd7dcae619..de4d39bbee 100644
--- a/core/src/main/scala/org/apache/spark/deploy/master/Master.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/master/Master.scala
@@ -17,17 +17,19 @@
package org.apache.spark.deploy.master
-import java.text.SimpleDateFormat
+import java.util.concurrent.TimeUnit
import java.util.Date
+import java.text.SimpleDateFormat
import scala.collection.mutable.{ArrayBuffer, HashMap, HashSet}
import akka.actor._
import akka.actor.Terminated
-import akka.remote.{RemoteClientLifeCycleEvent, RemoteClientDisconnected, RemoteClientShutdown}
-import akka.util.duration._
import akka.dispatch.Await
import akka.pattern.ask
+import akka.remote.{RemoteClientLifeCycleEvent, RemoteClientDisconnected, RemoteClientShutdown}
+import akka.util.duration._
+import akka.util.Timeout
import org.apache.spark.{Logging, SparkException}
import org.apache.spark.deploy.{ApplicationDescription, ExecutorState}
@@ -35,8 +37,6 @@ import org.apache.spark.deploy.DeployMessages._
import org.apache.spark.deploy.master.ui.MasterWebUI
import org.apache.spark.metrics.MetricsSystem
import org.apache.spark.util.{Utils, AkkaUtils}
-import akka.util.Timeout
-import java.util.concurrent.TimeUnit
private[spark] class Master(host: String, port: Int, webUiPort: Int) extends Actor with Logging {