Merge remote-tracking branch 'apache-github/branch-0.9' into branch-0.9-fix

Author: tdas

core/src/main/scala/org/apache/spark/rdd/PairRDDFunctions.scala

@@ -44,6 +44,7 @@ import com.clearspring.analytics.stream.cardinality.HyperLogLog
 import org.apache.hadoop.mapred.SparkHadoopWriter
 import org.apache.hadoop.mapreduce.SparkHadoopMapReduceUtil
 import org.apache.spark._
+import org.apache.spark.deploy.SparkHadoopUtil
 import org.apache.spark.SparkContext._
 import org.apache.spark.partial.{BoundedDouble, PartialResult}
 import org.apache.spark.Partitioner.defaultPartitioner
@@ -710,6 +711,7 @@ class PairRDDFunctions[K: ClassTag, V: ClassTag](self: RDD[(K, V)])
     if (valueClass == null) {
       throw new SparkException("Output value class not set")
     }
+    SparkHadoopUtil.get.addCredentials(conf)
 
     logDebug("Saving as hadoop file of type (" + keyClass.getSimpleName + ", " +
       valueClass.getSimpleName+ ")")

core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala

@@ -106,7 +106,9 @@ private[spark] class StageTable(val stages: Seq[StageInfo], val parent: JobProgr
     val description = listener.stageIdToDescription.get(s.stageId)
       .map(d => <div><em>{d}</em></div><div>{nameLink}</div>).getOrElse(nameLink)
     val finishTime = s.completionTime.getOrElse(System.currentTimeMillis())
-    val duration =  s.submissionTime.map(t => finishTime - t)
+    val duration = s.submissionTime.map { t =>
+      if (finishTime > t) finishTime - t else System.currentTimeMillis - t
+    }
 
     <tr>
       <td>{s.stageId}</td>

dev/merge_spark_pr.py

@@ -38,6 +38,8 @@
 # Remote name which points to Apache git
 PUSH_REMOTE_NAME = os.environ.get("PUSH_REMOTE_NAME", "apache")
 
+print "%s" % PUSH_REMOTE_NAME
+
 GIT_API_BASE = "https://api.github.com/repos/apache/spark"
 # Prefix added to temporary branches
 BRANCH_PREFIX = "PR_TOOL"

yarn/alpha/pom.xml

@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>yarn-parent_2.10</artifactId>
-    <version>0.9.0-incubating</version>
+    <version>0.9.1-incubating-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>