Return-Path: X-Original-To: apmail-flink-commits-archive@minotaur.apache.org Delivered-To: apmail-flink-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 8054019D7D for ; Fri, 18 Mar 2016 03:08:42 +0000 (UTC) Received: (qmail 78857 invoked by uid 500); 18 Mar 2016 03:08:42 -0000 Delivered-To: apmail-flink-commits-archive@flink.apache.org Received: (qmail 78817 invoked by uid 500); 18 Mar 2016 03:08:42 -0000 Mailing-List: contact commits-help@flink.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flink.apache.org Delivered-To: mailing list commits@flink.apache.org Received: (qmail 78739 invoked by uid 99); 18 Mar 2016 03:08:40 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Mar 2016 03:08:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B79B5DFC6F; Fri, 18 Mar 2016 03:08:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chiwanpark@apache.org To: commits@flink.apache.org Date: Fri, 18 Mar 2016 03:08:41 -0000 Message-Id: In-Reply-To: <3aab1d92cead4e2db5fac853d627c047@git.apache.org> References: <3aab1d92cead4e2db5fac853d627c047@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] flink git commit: [hotfix] Fix typo 'JobManger' [hotfix] Fix typo 'JobManger' This closes #1812. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/f42f4da3 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/f42f4da3 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/f42f4da3 Branch: refs/heads/master Commit: f42f4da34d405e489120a8fb20554003aa6c380b Parents: d107105 Author: Stefano Baghino Authored: Thu Mar 17 12:58:12 2016 +0100 Committer: Chiwan Park Committed: Fri Mar 18 12:03:02 2016 +0900 ---------------------------------------------------------------------- .../org/apache/flink/runtime/jobmanager/JobManager.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/f42f4da3/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala index 95305f3..518336c 100644 --- a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala +++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala @@ -1858,7 +1858,7 @@ object JobManager { val webMonitor: Option[WebMonitor] = if (configuration.getInteger(ConfigConstants.JOB_MANAGER_WEB_PORT_KEY, 0) >= 0) { - LOG.info("Starting JobManger web frontend") + LOG.info("Starting JobManager web frontend") val leaderRetrievalService = LeaderRetrievalUtils .createLeaderRetrievalService(configuration) @@ -2228,7 +2228,7 @@ object JobManager { * * @param configuration The configuration for the JobManager * @param actorSystem The actor system running the JobManager - * @param jobMangerActorName Optionally the name of the JobManager actor. If none is given, + * @param jobManagerActorName Optionally the name of the JobManager actor. If none is given, * the actor will have the name generated by the actor system. * @param archiveActorName Optionally the name of the archive actor. If none is given, * the actor will have the name generated by the actor system. @@ -2239,7 +2239,7 @@ object JobManager { def startJobManagerActors( configuration: Configuration, actorSystem: ActorSystem, - jobMangerActorName: Option[String], + jobManagerActorName: Option[String], archiveActorName: Option[String], jobManagerClass: Class[_ <: JobManager], archiveClass: Class[_ <: MemoryArchivist]) @@ -2284,7 +2284,7 @@ object JobManager { savepointStore, jobRecoveryTimeout) - val jobManager: ActorRef = jobMangerActorName match { + val jobManager: ActorRef = jobManagerActorName match { case Some(actorName) => actorSystem.actorOf(jobManagerProps, actorName) case None => actorSystem.actorOf(jobManagerProps) }