You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by le...@apache.org on 2021/03/10 11:08:36 UTC
[incubator-dolphinscheduler] branch json_split updated (c4d9cef ->
461e633)
This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a change to branch json_split
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git.
from c4d9cef [Feature][jsonsplit]add TaskDefinitionLogMapperTest/TaskDefinitionMapperTest and bugfix (#5012)
add fd4b59a [Improvement][Worker] Rename worker.weight to worker.host.weight (#4997) (#5014)
add 28dfde7 [Fix-4862][Server] Kill yarn application command won't be execute whe… (#4936)
add 3197b32 Grammar changes for README (#5021)
add 9a3ae48 Update PULL_REQUEST_TEMPLATE.md (#5022)
new 461e633 Merge remote-tracking branch 'upstream/dev' into spilit
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.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(-)
[incubator-dolphinscheduler] 01/01: Merge remote-tracking branch
'upstream/dev' into spilit
Posted by le...@apache.org.
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 <ba...@gmail.com>
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(-)