You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by gr...@apache.org on 2017/02/06 19:40:04 UTC

[1/2] flink git commit: [FLINK-2883] [docs] Add documentation to forbid key-modifying ReduceFunction

Repository: flink
Updated Branches:
  refs/heads/release-1.2 50a0eae91 -> 37d6f8196


[FLINK-2883] [docs] Add documentation to forbid key-modifying ReduceFunction

This closes #3256


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

Branch: refs/heads/release-1.2
Commit: 37d6f8196f12714491c95adb73319bb36e7a0d34
Parents: 57cd071
Author: Greg Hogan <co...@greghogan.com>
Authored: Thu Feb 2 16:15:52 2017 -0500
Committer: Greg Hogan <co...@greghogan.com>
Committed: Mon Feb 6 13:21:51 2017 -0500

----------------------------------------------------------------------
 docs/dev/batch/dataset_transformations.md | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/37d6f819/docs/dev/batch/dataset_transformations.md
----------------------------------------------------------------------
diff --git a/docs/dev/batch/dataset_transformations.md b/docs/dev/batch/dataset_transformations.md
index 1bfb87c..1f942d4 100644
--- a/docs/dev/batch/dataset_transformations.md
+++ b/docs/dev/batch/dataset_transformations.md
@@ -279,6 +279,10 @@ element using a user-defined reduce function.
 For each group of input elements, a reduce function successively combines pairs of elements into one
 element until only a single element for each group remains.
 
+Note that for a `ReduceFunction` the keyed fields of the returned object should match the input
+values. This is because reduce is implicitly combinable and objects emitted from the combine
+operator are again grouped by key when passed to the reduce operator.
+
 #### Reduce on DataSet Grouped by Key Expression
 
 Key expressions specify one or more fields of each element of a DataSet. Each key expression is


[2/2] flink git commit: [FLINK-5680] [docs] Document env.ssh.opts

Posted by gr...@apache.org.
[FLINK-5680] [docs] Document env.ssh.opts

Document env.ssh.opts in setup/config.html.

This closes #3247


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

Branch: refs/heads/release-1.2
Commit: 57cd0713183b4a2a2463736f672e1cd74cd913d6
Parents: 50a0eae
Author: Greg Hogan <co...@greghogan.com>
Authored: Wed Feb 1 09:48:31 2017 -0500
Committer: Greg Hogan <co...@greghogan.com>
Committed: Mon Feb 6 13:21:51 2017 -0500

----------------------------------------------------------------------
 docs/setup/config.md | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/57cd0713/docs/setup/config.md
----------------------------------------------------------------------
diff --git a/docs/setup/config.md b/docs/setup/config.md
index c19c04b..c720b50 100644
--- a/docs/setup/config.md
+++ b/docs/setup/config.md
@@ -519,6 +519,8 @@ Previously this key was named `recovery.mode` and the default value was `standal
 
 - `env.log.dir`: (Defaults to the `log` directory under Flink's home) Defines the directory where the Flink logs are saved. It has to be an absolute path.
 
+- `env.ssh.opts`: Additional command line options passed to SSH clients when starting or stopping JobManager, TaskManager, and Zookeeper services (start-cluster.sh, stop-cluster.sh, start-zookeeper-quorum.sh, stop-zookeeper-quorum.sh).
+
 ### Queryable State
 
 #### Server