You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by fh...@apache.org on 2016/11/17 22:46:32 UTC
[1/2] flink git commit: [hotfix] [docs] Fix incorrect URL.
Repository: flink
Updated Branches:
refs/heads/master 539880994 -> a67d3f80c
[hotfix] [docs] Fix incorrect URL.
This closes #2821.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/df0d0578
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/df0d0578
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/df0d0578
Branch: refs/heads/master
Commit: df0d05782a0e1424b2939e4c802bbb0f8e4dd502
Parents: 5398809
Author: Rohit Agarwal <mi...@gmail.com>
Authored: Wed Nov 16 16:49:57 2016 -0800
Committer: Fabian Hueske <fh...@apache.org>
Committed: Thu Nov 17 17:55:11 2016 +0100
----------------------------------------------------------------------
docs/dev/api_concepts.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/df0d0578/docs/dev/api_concepts.md
----------------------------------------------------------------------
diff --git a/docs/dev/api_concepts.md b/docs/dev/api_concepts.md
index b0c034c..ac7d101 100644
--- a/docs/dev/api_concepts.md
+++ b/docs/dev/api_concepts.md
@@ -272,7 +272,7 @@ We will now give an overview of each of those steps, please refer to the respect
more details. Note that all core classes of the Scala DataSet API are found in the package
{% gh_link /flink-scala/src/main/scala/org/apache/flink/api/scala "org.apache.flink.api.scala" %}
while the classes of the Scala DataStream API can be found in
-{% gh_link /flink-streaming-scala/src/main/java/org/apache/flink/streaming/api/scala "org.apache.flink.streaming.api.scala" %}.
+{% gh_link /flink-streaming-scala/src/main/scala/org/apache/flink/streaming/api/scala "org.apache.flink.streaming.api.scala" %}.
The `StreamExecutionEnvironment` is the basis for all Flink programs. You can
obtain one using these static methods on `StreamExecutionEnvironment`:
[2/2] flink git commit: [FLINK-5058] [scala-shell] Set correct value
for TaskManager memory parameter.
Posted by fh...@apache.org.
[FLINK-5058] [scala-shell] Set correct value for TaskManager memory parameter.
This closes #2799.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/a67d3f80
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/a67d3f80
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/a67d3f80
Branch: refs/heads/master
Commit: a67d3f80c9782cfc8f70586b086a86ba897e6dbc
Parents: df0d057
Author: iteblog <wy...@163.com>
Authored: Mon Nov 14 19:04:28 2016 +0800
Committer: Fabian Hueske <fh...@apache.org>
Committed: Thu Nov 17 17:55:53 2016 +0100
----------------------------------------------------------------------
.../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/a67d3f80/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 3499b9e..4d3adb2 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
@@ -242,7 +242,7 @@ object FlinkShell {
// set configuration from user input
yarnConfig.jobManagerMemory.foreach((jmMem) => args ++= Seq("-yjm", jmMem.toString))
- yarnConfig.slots.foreach((tmMem) => args ++= Seq("-ytm", tmMem.toString))
+ yarnConfig.taskManagerMemory.foreach((tmMem) => args ++= Seq("-ytm", tmMem.toString))
yarnConfig.name.foreach((name) => args ++= Seq("-ynm", name.toString))
yarnConfig.queue.foreach((queue) => args ++= Seq("-yqu", queue.toString))
yarnConfig.slots.foreach((slots) => args ++= Seq("-ys", slots.toString))