You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2017/03/21 14:55:06 UTC
[1/2] flink git commit: [FLINK-4326] [scripts] [fixup] Fix
taskmanager bash script
Repository: flink
Updated Branches:
refs/heads/release-1.2 88db01a0e -> d398205ed
[FLINK-4326] [scripts] [fixup] Fix taskmanager bash script
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/d4bfee90
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/d4bfee90
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/d4bfee90
Branch: refs/heads/release-1.2
Commit: d4bfee9016d970a9589fb7c1efc3960196391560
Parents: 88db01a
Author: Stephan Ewen <se...@apache.org>
Authored: Tue Mar 21 15:42:46 2017 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Tue Mar 21 15:42:46 2017 +0100
----------------------------------------------------------------------
flink-dist/src/main/flink-bin/bin/taskmanager.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/d4bfee90/flink-dist/src/main/flink-bin/bin/taskmanager.sh
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/taskmanager.sh b/flink-dist/src/main/flink-bin/bin/taskmanager.sh
index 34fb994..1319d24 100755
--- a/flink-dist/src/main/flink-bin/bin/taskmanager.sh
+++ b/flink-dist/src/main/flink-bin/bin/taskmanager.sh
@@ -99,5 +99,5 @@ fi
if [[ $STARTSTOP == "start-foreground" ]]; then
"${FLINK_BIN_DIR}"/flink-console.sh taskmanager "${args[@]}"
else
- "${FLINK_BIN_DIR}/flink-daemon.sh $STARTSTOP taskmanager ${args[@]}"
+ "${FLINK_BIN_DIR}"/flink-daemon.sh $STARTSTOP taskmanager "${args[@]}"
fi
[2/2] flink git commit: [FLINK-6000] [scripts] Fix starting HA
cluster with start-cluster.sh
Posted by se...@apache.org.
[FLINK-6000] [scripts] Fix starting HA cluster with start-cluster.sh
This closes #3506
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/d398205e
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/d398205e
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/d398205e
Branch: refs/heads/release-1.2
Commit: d398205edbdf1e76569e6508be1066243e7b1101
Parents: d4bfee9
Author: Dawid Wysakowicz <da...@getindata.com>
Authored: Fri Mar 10 09:15:06 2017 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Tue Mar 21 15:43:29 2017 +0100
----------------------------------------------------------------------
flink-dist/src/main/flink-bin/bin/config.sh | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/d398205e/flink-dist/src/main/flink-bin/bin/config.sh
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/config.sh b/flink-dist/src/main/flink-bin/bin/config.sh
index 0f24034..69d70ef 100755
--- a/flink-dist/src/main/flink-bin/bin/config.sh
+++ b/flink-dist/src/main/flink-bin/bin/config.sh
@@ -271,8 +271,6 @@ if [ -z "${HIGH_AVAILABILITY}" ]; then
else
HIGH_AVAILABILITY=${DEPRECATED_HA}
fi
- else
- HIGH_AVAILABILITY="none"
fi
fi