From commits-return-16841-archive-asf-public=cust-asf.ponee.io@flink.apache.org Fri Apr 13 21:18:24 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 381C218072F for ; Fri, 13 Apr 2018 21:18:24 +0200 (CEST) Received: (qmail 44510 invoked by uid 500); 13 Apr 2018 19:18:23 -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 44260 invoked by uid 99); 13 Apr 2018 19:18:23 -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, 13 Apr 2018 19:18:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 19EE0F32C5; Fri, 13 Apr 2018 19:18:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: trohrmann@apache.org To: commits@flink.apache.org Date: Fri, 13 Apr 2018 19:18:26 -0000 Message-Id: In-Reply-To: <6cb4f36620794d3dad4044d705a5ef32@git.apache.org> References: <6cb4f36620794d3dad4044d705a5ef32@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] flink git commit: [hotfix][typo] fix some typos [hotfix][typo] fix some typos Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/e61c8b1f Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/e61c8b1f Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/e61c8b1f Branch: refs/heads/release-1.5 Commit: e61c8b1f5c4ab04061a08804427d2154811b8d3f Parents: 833b83b Author: Nico Kruber Authored: Fri Mar 9 12:11:55 2018 +0100 Committer: Till Rohrmann Committed: Fri Apr 13 12:17:57 2018 -0700 ---------------------------------------------------------------------- .../org/apache/flink/client/program/ContextEnvironmentFactory.java | 2 +- .../java/org/apache/flink/yarn/AbstractYarnClusterDescriptor.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/e61c8b1f/flink-clients/src/main/java/org/apache/flink/client/program/ContextEnvironmentFactory.java ---------------------------------------------------------------------- diff --git a/flink-clients/src/main/java/org/apache/flink/client/program/ContextEnvironmentFactory.java b/flink-clients/src/main/java/org/apache/flink/client/program/ContextEnvironmentFactory.java index 64b1863..8c1d9eb 100644 --- a/flink-clients/src/main/java/org/apache/flink/client/program/ContextEnvironmentFactory.java +++ b/flink-clients/src/main/java/org/apache/flink/client/program/ContextEnvironmentFactory.java @@ -64,7 +64,7 @@ public class ContextEnvironmentFactory implements ExecutionEnvironmentFactory { @Override public ExecutionEnvironment createExecutionEnvironment() { if (isDetached && lastEnvCreated != null) { - throw new InvalidProgramException("Multiple enviornments cannot be created in detached mode"); + throw new InvalidProgramException("Multiple environments cannot be created in detached mode"); } lastEnvCreated = isDetached http://git-wip-us.apache.org/repos/asf/flink/blob/e61c8b1f/flink-yarn/src/main/java/org/apache/flink/yarn/AbstractYarnClusterDescriptor.java ---------------------------------------------------------------------- diff --git a/flink-yarn/src/main/java/org/apache/flink/yarn/AbstractYarnClusterDescriptor.java b/flink-yarn/src/main/java/org/apache/flink/yarn/AbstractYarnClusterDescriptor.java index ef266f0..9d504d3 100644 --- a/flink-yarn/src/main/java/org/apache/flink/yarn/AbstractYarnClusterDescriptor.java +++ b/flink-yarn/src/main/java/org/apache/flink/yarn/AbstractYarnClusterDescriptor.java @@ -1070,7 +1070,7 @@ public abstract class AbstractYarnClusterDescriptor implements ClusterDescriptor LOG.info("The Flink YARN client has been started in detached mode. In order to stop " + "Flink on YARN, use the following command or a YARN web interface to stop " + "it:\nyarn application -kill " + appId + "\nPlease also note that the " + - "temporary files of the YARN session in the home directoy will not be removed."); + "temporary files of the YARN session in the home directory will not be removed."); } // since deployment was successful, remove the hook ShutdownHookUtil.removeShutdownHook(deploymentFailureHook, getClass().getSimpleName(), LOG);