From 85aa6079fe610fe4cce066da90edcc7cf87a9704 Mon Sep 17 00:00:00 2001
From: Lorenz Buehmann <buehmann@informatik.uni-leipzig.de>
Date: Fri, 6 Jan 2017 13:34:13 +0100
Subject: [PATCH 1/2] [Flink-5378] Bumped Scopt version to 3.5.0.

This will also allow for using comma-separated values in the CLI.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d536ac3ad025b..e382d2acd460d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -401,7 +401,7 @@ under the License.
 			<dependency>
 				<groupId>com.github.scopt</groupId>
 				<artifactId>scopt_${scala.binary.version}</artifactId>
-				<version>3.2.0</version>
+				<version>3.5.0</version>
 				<exclusions>
 					<exclusion>
 						<groupId>org.scala-lang</groupId>

From c815bad3817f22d711c108a97f11c68df2b5d3db Mon Sep 17 00:00:00 2001
From: Lorenz Buehmann <buehmann@informatik.uni-leipzig.de>
Date: Tue, 18 Apr 2017 09:28:18 +0200
Subject: [PATCH 2/2] [FLINK-6317] Fix wrong default directory for history
 server

---
 .../apache/flink/runtime/webmonitor/history/HistoryServer.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/history/HistoryServer.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/history/HistoryServer.java
index f05bd02832a4d..4163581bf31d5 100644
--- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/history/HistoryServer.java
+++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/history/HistoryServer.java
@@ -138,7 +138,7 @@ public HistoryServer(Configuration config) throws IOException, FlinkException {
 
 		String webDirectory = config.getString(HistoryServerOptions.HISTORY_SERVER_WEB_DIR);
 		if (webDirectory == null) {
-			webDirectory = System.getProperty("java.io.tmpdir") + "flink-web-history-" + UUID.randomUUID();
+			webDirectory = System.getProperty("java.io.tmpdir") + File.separator + "flink-web-history-" + UUID.randomUUID();
 		}
 		webDir = new File(webDirectory);