This is an automated email from the ASF dual-hosted git repository. leonbao pushed a commit to branch json_split in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit 6ab389298969f65103361cac34b8e1f2b9039bf7 Merge: c33cc87 2d8c4ec Author: lenboo <[email protected]> AuthorDate: Mon Mar 15 17:38:49 2021 +0800 Merge remote-tracking branch 'upstream/dev' into spilit docker/build/README.md | 2 +- docker/build/README_zh_CN.md | 2 +- .../conf/dolphinscheduler/env/dolphinscheduler_env.sh.tpl | 2 +- docker/build/startup-init-conf.sh | 2 +- docker/docker-swarm/docker-compose.yml | 2 +- docker/docker-swarm/docker-stack.yml | 2 +- docker/kubernetes/dolphinscheduler/values.yaml | 4 ++-- .../server/worker/task/PythonCommandExecutor.java | 14 +++++--------- .../apache/dolphinscheduler/server/worker/EnvFileTest.java | 3 ++- script/env/dolphinscheduler_env.sh | 2 +- 10 files changed, 16 insertions(+), 19 deletions(-)
