You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by mx...@apache.org on 2015/10/27 18:28:36 UTC
[1/2] flink git commit: Add org.apache.httpcomponents:(httpcore,
httpclient) to dependency management
Repository: flink
Updated Branches:
refs/heads/master 7414e3147 -> 3db531785
Add org.apache.httpcomponents:(httpcore, httpclient) to dependency management
This closes #1301.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/5cfd49ea
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/5cfd49ea
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/5cfd49ea
Branch: refs/heads/master
Commit: 5cfd49eaad148b13987b598593fa75422fdba8e2
Parents: 7414e31
Author: Ufuk Celebi <uc...@apache.org>
Authored: Mon Oct 26 15:34:58 2015 +0100
Committer: Maximilian Michels <mx...@apache.org>
Committed: Tue Oct 27 18:27:44 2015 +0100
----------------------------------------------------------------------
flink-runtime/pom.xml | 2 +-
pom.xml | 12 ++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/5cfd49ea/flink-runtime/pom.xml
----------------------------------------------------------------------
diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml
index 1b4c51f..a1e0f75 100644
--- a/flink-runtime/pom.xml
+++ b/flink-runtime/pom.xml
@@ -78,7 +78,7 @@ under the License.
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.2</version>
+ <!-- Version is set in root POM -->
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/5cfd49ea/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 10f16df..7d6b9be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -339,6 +339,18 @@ under the License.
<artifactId>netty-all</artifactId>
<version>4.0.31.Final</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>4.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.2</version>
+ </dependency>
</dependencies>
</dependencyManagement>
[2/2] flink git commit: [FLINK-2927] [runtime] Provide default
required configuration keys in flink-conf of binary distribution
Posted by mx...@apache.org.
[FLINK-2927] [runtime] Provide default required configuration keys in flink-conf of binary distribution
This closes #1303.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/3db53178
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/3db53178
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/3db53178
Branch: refs/heads/master
Commit: 3db531785c47c32ad1dc474e02418df5c4215ab9
Parents: 5cfd49e
Author: Ufuk Celebi <uc...@apache.org>
Authored: Tue Oct 27 17:40:03 2015 +0100
Committer: Maximilian Michels <mx...@apache.org>
Committed: Tue Oct 27 18:28:01 2015 +0100
----------------------------------------------------------------------
flink-dist/src/main/resources/flink-conf.yaml | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/3db53178/flink-dist/src/main/resources/flink-conf.yaml
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/resources/flink-conf.yaml b/flink-dist/src/main/resources/flink-conf.yaml
index 5928d93..6f56e89 100644
--- a/flink-dist/src/main/resources/flink-conf.yaml
+++ b/flink-dist/src/main/resources/flink-conf.yaml
@@ -128,13 +128,18 @@ webclient.port: 8080
#==============================================================================
-# High Availability
+# Master High Availability (required configuration)
#==============================================================================
# The list of ZooKepper quorum peers that coordinate the high-availability
-# setup. This must be a list of the form
-# "host_1[:peerPort[:leaderPort]],host_2[:peerPort[:leaderPort]],..."
+# setup. This must be a list of the form:
+# "host1:clientPort,host2[:clientPort],..." (default clientPort: 2181)
#
# recovery.mode: zookeeper
#
-# recovery.zookeeper.quorum: localhost
+# recovery.zookeeper.quorum: localhost:2181,...
+#
+# Note: You need to set the state backend to 'filesystem' and the checkpoint
+# directory (see above) before configuring the storageDir.
+#
+# recovery.zookeeper.storageDir: hdfs:///recovery