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 461e6334aeab610d0a7b00bd617dd9167c808297 Merge: c4d9cef 9a3ae48 Author: lenboo <[email protected]> AuthorDate: Wed Mar 10 19:08:17 2021 +0800 Merge remote-tracking branch 'upstream/dev' into spilit .github/PULL_REQUEST_TEMPLATE.md | 20 ++++++------- README.md | 14 ++++----- .../DOLPHIN/1.3.3/configuration/dolphin-worker.xml | 4 +-- docker/build/README.md | 2 +- docker/build/README_zh_CN.md | 2 +- .../conf/dolphinscheduler/worker.properties.tpl | 4 +-- docker/build/startup-init-conf.sh | 2 +- docker/docker-swarm/docker-compose.yml | 2 +- docker/docker-swarm/docker-stack.yml | 2 +- docker/kubernetes/dolphinscheduler/README.md | 2 +- .../configmap-dolphinscheduler-worker.yaml | 2 +- .../statefulset-dolphinscheduler-worker.yaml | 2 +- docker/kubernetes/dolphinscheduler/values.yaml | 2 +- .../server/utils/ProcessUtils.java | 7 ++--- .../server/worker/config/WorkerConfig.java | 12 ++++---- .../server/worker/processor/TaskKillProcessor.java | 33 +++++++++++----------- .../server/worker/registry/WorkerRegistry.java | 2 +- .../src/main/resources/worker.properties | 4 +-- 18 files changed, 57 insertions(+), 61 deletions(-)
