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 ED08110CF0 for ; Wed, 16 Oct 2013 02:03:26 +0000 (UTC) Received: (qmail 66863 invoked by uid 500); 16 Oct 2013 02:03:21 -0000 Delivered-To: apmail-spark-commits-archive@spark.apache.org Received: (qmail 66627 invoked by uid 500); 16 Oct 2013 02:03:21 -0000 Mailing-List: contact commits-help@spark.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@spark.incubator.apache.org Delivered-To: mailing list commits@spark.incubator.apache.org Received: (qmail 66569 invoked by uid 99); 16 Oct 2013 02:03:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Oct 2013 02:03:20 +0000 X-ASF-Spam-Status: No, hits=-2000.5 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 16 Oct 2013 02:03:19 +0000 Received: (qmail 66230 invoked by uid 99); 16 Oct 2013 02:02:59 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Oct 2013 02:02:59 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E2DFB8B5979; Wed, 16 Oct 2013 02:02:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: matei@apache.org To: commits@spark.incubator.apache.org Date: Wed, 16 Oct 2013 02:03:02 -0000 Message-Id: <664271cbf54c41638640d11396197688@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/5] git commit: Merge pull request #34 from kayousterhout/rename X-Virus-Checked: Checked by ClamAV on apache.org Merge pull request #34 from kayousterhout/rename Renamed StandaloneX to CoarseGrainedX. (as suggested by @rxin here https://github.com/apache/incubator-spark/pull/14) The previous names were confusing because the components weren't just used in Standalone mode. The scheduler used for Standalone mode is called SparkDeploySchedulerBackend, so referring to the base class as StandaloneSchedulerBackend was misleading. Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/6dbd2208 Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/6dbd2208 Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/6dbd2208 Branch: refs/heads/master Commit: 6dbd2208ffe1df0b2a871f7f18b08bd825f61001 Parents: 983b83f f95a2be Author: Matei Zaharia Authored: Tue Oct 15 19:02:57 2013 -0700 Committer: Matei Zaharia Committed: Tue Oct 15 19:02:57 2013 -0700 ---------------------------------------------------------------------- .../scala/org/apache/spark/SparkContext.scala | 4 +- .../executor/CoarseGrainedExecutorBackend.scala | 117 +++++++++++ .../executor/StandaloneExecutorBackend.scala | 115 ---------- .../cluster/CoarseGrainedClusterMessage.scala | 65 ++++++ .../cluster/CoarseGrainedSchedulerBackend.scala | 210 +++++++++++++++++++ .../cluster/SparkDeploySchedulerBackend.scala | 6 +- .../cluster/StandaloneClusterMessage.scala | 65 ------ .../cluster/StandaloneSchedulerBackend.scala | 207 ------------------ .../mesos/CoarseMesosSchedulerBackend.scala | 15 +- 9 files changed, 405 insertions(+), 399 deletions(-) ----------------------------------------------------------------------