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 8720c2629cc89068e52fb95583e8afaf81e78613 Merge: 0571681 fbe0eda Author: lenboo <[email protected]> AuthorDate: Fri Feb 26 15:06:58 2021 +0800 Merge remote-tracking branch 'upstream/dev' into spilit docker/build/README.md | 4 +++- docker/build/README_zh_CN.md | 2 +- docker/build/conf/dolphinscheduler/worker.properties.tpl | 2 +- docker/build/startup-init-conf.sh | 2 +- docker/docker-swarm/docker-compose.yml | 2 +- docker/docker-swarm/docker-stack.yml | 2 +- .../dolphinscheduler/templates/configmap-dolphinscheduler-worker.yaml | 2 +- .../templates/statefulset-dolphinscheduler-worker.yaml | 4 ++-- docker/kubernetes/dolphinscheduler/values.yaml | 2 +- .../dolphinscheduler/plugin/alert/script/ScriptAlertChannel.java | 2 +- 10 files changed, 13 insertions(+), 11 deletions(-)
