You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ga...@apache.org on 2018/09/20 18:49:45 UTC

[flink] branch master updated (a8964ac -> 61cfad7)

This is an automated email from the ASF dual-hosted git repository.

gary pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git.


    from a8964ac  [FLINK-10050][DataStream API] Support allowedLateness in CoGroupedStreams.
     new b3faf4c  [hotfix][doc] Fix curl example in upload jar example
     new ae5ce53  [hotfix][docs] Regenerate docs to fix curl example for uploading jars.
     new 61cfad7  [hotfix][tests] Add file sshd-run.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 docs/_includes/generated/rest_v1_dispatcher.html                       | 2 +-
 .../resources/log4j-test.properties => flink-jepsen/docker/sshd-run    | 3 ++-
 .../org/apache/flink/runtime/webmonitor/handlers/JarUploadHeaders.java | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
 copy flink-connectors/flink-jdbc/src/test/resources/log4j-test.properties => flink-jepsen/docker/sshd-run (96%)


[flink] 02/03: [hotfix][docs] Regenerate docs to fix curl example for uploading jars.

Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

gary pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git

commit ae5ce53cbcd443d8bf7fb278f393d0fa2e535685
Author: gyao <ga...@data-artisans.com>
AuthorDate: Thu Sep 20 15:48:56 2018 +0200

    [hotfix][docs] Regenerate docs to fix curl example for uploading jars.
---
 docs/_includes/generated/rest_v1_dispatcher.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_includes/generated/rest_v1_dispatcher.html b/docs/_includes/generated/rest_v1_dispatcher.html
index ec6989b..6ee705e 100644
--- a/docs/_includes/generated/rest_v1_dispatcher.html
+++ b/docs/_includes/generated/rest_v1_dispatcher.html
@@ -178,7 +178,7 @@
     </tr>
     <tr>
       <td colspan="2">Uploads a jar to the cluster. The jar must be sent as multi-part data. Make sure that the "Content-Type" header is set to "application/x-java-archive", as some http libraries do not add the header by default.
-Using 'curl' you can upload a jar via 'curl -X POST -H "Expect:" -F "jarfile=#path/to/flink-job.jar" http://hostname:port/jars/upload'.</td>
+Using 'curl' you can upload a jar via 'curl -X POST -H "Expect:" -F "jarfile=@path/to/flink-job.jar" http://hostname:port/jars/upload'.</td>
     </tr>
     <tr>
       <td colspan="2">


[flink] 01/03: [hotfix][doc] Fix curl example in upload jar example

Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

gary pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git

commit b3faf4c4631e141e94a98af6c4753d833254b5fb
Author: Sayat Satybaldiyev <sa...@gmail.com>
AuthorDate: Mon Sep 17 21:22:47 2018 +0200

    [hotfix][doc] Fix curl example in upload jar example
    
    This closes #6706.
---
 .../org/apache/flink/runtime/webmonitor/handlers/JarUploadHeaders.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarUploadHeaders.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarUploadHeaders.java
index d969b4fc..8b57359 100644
--- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarUploadHeaders.java
+++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarUploadHeaders.java
@@ -73,7 +73,7 @@ public final class JarUploadHeaders implements MessageHeaders<EmptyRequestBody,
 	public String getDescription() {
 		return "Uploads a jar to the cluster. The jar must be sent as multi-part data. Make sure that the \"Content-Type\"" +
 			" header is set to \"application/x-java-archive\", as some http libraries do not add the header by default.\n" +
-			"Using 'curl' you can upload a jar via 'curl -X POST -H \"Expect:\" -F \"jarfile=#path/to/flink-job.jar\" http://hostname:port" + URL + "'.";
+			"Using 'curl' you can upload a jar via 'curl -X POST -H \"Expect:\" -F \"jarfile=@path/to/flink-job.jar\" http://hostname:port" + URL + "'.";
 	}
 
 	@Override


[flink] 03/03: [hotfix][tests] Add file sshd-run.

Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

gary pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git

commit 61cfad7a3a55f6c03b6ff4e951f5ba6dade22b79
Author: gyao <ga...@data-artisans.com>
AuthorDate: Thu Sep 20 18:01:48 2018 +0200

    [hotfix][tests] Add file sshd-run.
    
    The file that was previously missing is needed to build the docker images used
    for running the Jepsen tests locally.
---
 flink-jepsen/docker/sshd-run | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/flink-jepsen/docker/sshd-run b/flink-jepsen/docker/sshd-run
new file mode 100644
index 0000000..fe7a957
--- /dev/null
+++ b/flink-jepsen/docker/sshd-run
@@ -0,0 +1,20 @@
+#!/bin/bash
+################################################################################
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+# limitations under the License.
+################################################################################
+
+exec /usr/sbin/sshd -D
\ No newline at end of file