You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tz...@apache.org on 2017/12/18 07:25:27 UTC

[5/5] flink git commit: [hotfix] [doc] Fix typo in TaskManager and EnvironmentInformation doc

[hotfix] [doc] Fix typo in TaskManager and EnvironmentInformation doc

This closes #5135.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/7f99a0df
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/7f99a0df
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/7f99a0df

Branch: refs/heads/master
Commit: 7f99a0df669dc73c983913c505c7f72dab3c0a4d
Parents: c57e56f
Author: Cristian <me...@cristian.io>
Authored: Thu Dec 7 11:00:00 2017 -0800
Committer: Tzu-Li (Gordon) Tai <tz...@apache.org>
Committed: Sun Dec 17 20:52:09 2017 -0800

----------------------------------------------------------------------
 .../org/apache/flink/runtime/util/EnvironmentInformation.java  | 2 +-
 .../org/apache/flink/runtime/taskmanager/TaskManager.scala     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/7f99a0df/flink-runtime/src/main/java/org/apache/flink/runtime/util/EnvironmentInformation.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/util/EnvironmentInformation.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/EnvironmentInformation.java
index a2a64cf..e700256 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/util/EnvironmentInformation.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/util/EnvironmentInformation.java
@@ -259,7 +259,7 @@ public class EnvironmentInformation {
 	}
 	
 	/**
-	 * Logs a information about the environment, like code revision, current user, java version,
+	 * Logs information about the environment, like code revision, current user, Java version,
 	 * and JVM parameters.
 	 *
 	 * @param log The logger to log the information to.

http://git-wip-us.apache.org/repos/asf/flink/blob/7f99a0df/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
index f948df4..9979618 100644
--- a/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
+++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
@@ -585,8 +585,8 @@ class TaskManager(
               config.getMaxRegistrationPause().toMilliseconds,
               TimeUnit.MILLISECONDS))
 
-            // schedule (with our timeout s delay) a check triggers a new registration
-            // attempt, if we are not registered by then
+            // schedule a check to trigger a new registration attempt if not registered
+            // by the timeout
             scheduledTaskManagerRegistration = Option(context.system.scheduler.scheduleOnce(
               timeout,
               self,
@@ -1898,7 +1898,7 @@ object TaskManager {
   }
 
   /**
-    * Starts and runs the TaskManager. with all its components trying to bind to
+    * Starts and runs the TaskManager with all its components trying to bind to
     * a port in the specified range.
     *
     * @param taskManagerHostname The hostname/address of the interface where the actor system