spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pwend...@apache.org
Subject spark git commit: [SPARK-4952][Core]Handle ConcurrentModificationExceptions in SparkEnv.environmentDetails
Date Sat, 27 Dec 2014 07:31:32 GMT
Repository: spark
Updated Branches:
  refs/heads/master 786808abf -> 080ceb771


[SPARK-4952][Core]Handle ConcurrentModificationExceptions in SparkEnv.environmentDetails

Author: GuoQiang Li <witgo@qq.com>

Closes #3788 from witgo/SPARK-4952 and squashes the following commits:

d903529 [GuoQiang Li] Handle ConcurrentModificationExceptions in SparkEnv.environmentDetails


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/080ceb77
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/080ceb77
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/080ceb77

Branch: refs/heads/master
Commit: 080ceb771a1e6b9f844cfd4f1baa01133c106888
Parents: 786808a
Author: GuoQiang Li <witgo@qq.com>
Authored: Fri Dec 26 23:31:29 2014 -0800
Committer: Patrick Wendell <pwendell@gmail.com>
Committed: Fri Dec 26 23:31:29 2014 -0800

----------------------------------------------------------------------
 core/src/main/scala/org/apache/spark/SparkEnv.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/080ceb77/core/src/main/scala/org/apache/spark/SparkEnv.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/SparkEnv.scala b/core/src/main/scala/org/apache/spark/SparkEnv.scala
index 6656df4..43436a1 100644
--- a/core/src/main/scala/org/apache/spark/SparkEnv.scala
+++ b/core/src/main/scala/org/apache/spark/SparkEnv.scala
@@ -395,7 +395,7 @@ object SparkEnv extends Logging {
     val sparkProperties = (conf.getAll ++ schedulerMode).sorted
 
     // System properties that are not java classpaths
-    val systemProperties = System.getProperties.iterator.toSeq
+    val systemProperties = Utils.getSystemProperties.toSeq
     val otherProperties = systemProperties.filter { case (k, _) =>
       k != "java.class.path" && !k.startsWith("spark.")
     }.sorted


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message