flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject flink git commit: [FLINK-3776] Flink Scala shell does not allow to set configuration for local execution
Date Fri, 13 May 2016 08:55:03 GMT
Repository: flink
Updated Branches:
  refs/heads/master 3c90d3654 -> 099fdfa0c


[FLINK-3776] Flink Scala shell does not allow to set configuration for local execution

This closes #1945


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

Branch: refs/heads/master
Commit: 099fdfa0c5789f509242f83e8f808d552e63ee8d
Parents: 3c90d36
Author: eastcirclek <eastcirclek@gmail.com>
Authored: Thu Apr 28 21:48:59 2016 +0900
Committer: Maximilian Michels <mxm@apache.org>
Committed: Fri May 13 10:54:02 2016 +0200

----------------------------------------------------------------------
 .../src/main/scala/org/apache/flink/api/scala/FlinkShell.scala     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/099fdfa0/flink-scala-shell/src/main/scala/org/apache/flink/api/scala/FlinkShell.scala
----------------------------------------------------------------------
diff --git a/flink-scala-shell/src/main/scala/org/apache/flink/api/scala/FlinkShell.scala
b/flink-scala-shell/src/main/scala/org/apache/flink/api/scala/FlinkShell.scala
index 2618b09..7b80206 100644
--- a/flink-scala-shell/src/main/scala/org/apache/flink/api/scala/FlinkShell.scala
+++ b/flink-scala-shell/src/main/scala/org/apache/flink/api/scala/FlinkShell.scala
@@ -141,7 +141,7 @@ object FlinkShell {
   ): (String, Int, Option[Either[FlinkMiniCluster, AbstractFlinkYarnCluster]]) = {
     config.executionMode match {
       case ExecutionMode.LOCAL => // Local mode
-        val config = new Configuration()
+        val config = GlobalConfiguration.getConfiguration()
         config.setInteger(ConfigConstants.JOB_MANAGER_IPC_PORT_KEY, 0)
 
         val miniCluster = new LocalFlinkMiniCluster(config, false)


Mime
View raw message