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 CD18918381 for ; Thu, 9 Jul 2015 10:08:41 +0000 (UTC) Received: (qmail 99731 invoked by uid 500); 9 Jul 2015 10:07:49 -0000 Delivered-To: apmail-flink-commits-archive@flink.apache.org Received: (qmail 99711 invoked by uid 500); 9 Jul 2015 10:07:49 -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 99701 invoked by uid 99); 9 Jul 2015 10:07:49 -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; Thu, 09 Jul 2015 10:07:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 30558E6817; Thu, 9 Jul 2015 10:07:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sewen@apache.org To: commits@flink.apache.org Message-Id: <74a1dbb00bb94b4e8d3376cac4642629@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: flink git commit: [hotfix] Fix wrong unit (secs vs msecs) in TaskManager logging statement. Date: Thu, 9 Jul 2015 10:07:45 +0000 (UTC) Repository: flink Updated Branches: refs/heads/master 590c6d064 -> 7ce05ad57 [hotfix] Fix wrong unit (secs vs msecs) in TaskManager logging statement. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/7ce05ad5 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/7ce05ad5 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/7ce05ad5 Branch: refs/heads/master Commit: 7ce05ad57c7bfd7a6227886790c0a6dc3d152ff1 Parents: 590c6d0 Author: Stephan Ewen Authored: Thu Jul 9 12:06:56 2015 +0200 Committer: Stephan Ewen Committed: Thu Jul 9 12:06:56 2015 +0200 ---------------------------------------------------------------------- .../scala/org/apache/flink/runtime/taskmanager/TaskManager.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/7ce05ad5/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 5abcab8..273e072 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 @@ -1177,7 +1177,7 @@ object TaskManager { LOG.info("Trying to select the network interface and address to use " + "by connecting to the configured JobManager.") - LOG.info(s"TaskManager will try to connect for $MAX_STARTUP_CONNECT_TIME seconds before " + + LOG.info(s"TaskManager will try to connect for $MAX_STARTUP_CONNECT_TIME milliseconds before " + "falling back to heuristics") val jobManagerAddress = new InetSocketAddress(jobManagerHostname, jobManagerPort)