Return-Path: X-Original-To: apmail-spark-commits-archive@minotaur.apache.org Delivered-To: apmail-spark-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6D898108FE for ; Sat, 27 Dec 2014 07:31:32 +0000 (UTC) Received: (qmail 46634 invoked by uid 500); 27 Dec 2014 07:31:32 -0000 Delivered-To: apmail-spark-commits-archive@spark.apache.org Received: (qmail 46603 invoked by uid 500); 27 Dec 2014 07:31:32 -0000 Mailing-List: contact commits-help@spark.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@spark.apache.org Received: (qmail 46594 invoked by uid 99); 27 Dec 2014 07:31:32 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 27 Dec 2014 07:31:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 175828C50D8; Sat, 27 Dec 2014 07:31:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pwendell@apache.org To: commits@spark.apache.org Message-Id: <5202d73c2eaa43119be99a0fe919a0f1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: spark git commit: [SPARK-4952][Core]Handle ConcurrentModificationExceptions in SparkEnv.environmentDetails Date: Sat, 27 Dec 2014 07:31:32 +0000 (UTC) Repository: spark Updated Branches: refs/heads/master 786808abf -> 080ceb771 [SPARK-4952][Core]Handle ConcurrentModificationExceptions in SparkEnv.environmentDetails Author: GuoQiang Li 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 Authored: Fri Dec 26 23:31:29 2014 -0800 Committer: Patrick Wendell 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