This is an automated email from the ASF dual-hosted git repository. kirs pushed a commit to branch json_split_two in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
commit fc203fb41cafdf7336216804d2b2543562ad5a22 Merge: 85f3ab4 93f1d4d Author: CalvinKirs <[email protected]> AuthorDate: Thu Jun 24 10:48:11 2021 +0800 Merge remote-tracking branch 'origin/dev' into json_split_two # Conflicts: # .github/actions/translate-on-issue # docker/build/conf/dolphinscheduler/registry.properties.tpl # docker/build/startup-init-conf.sh # docker/docker-swarm/config.env.sh # docker/kubernetes/dolphinscheduler/templates/_helpers.tpl # dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionControllerTest.java # dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/registry/RegistryCenter.java # dolphinscheduler-service/src/main/resources/registry.properties .../conf/dolphinscheduler/registry.properties.tpl | 8 ++- docker/build/startup-init-conf.sh | 2 +- docker/docker-swarm/config.env.sh | 5 +- .../dolphinscheduler/templates/_helpers.tpl | 24 ++++--- .../apache/dolphinscheduler/api/utils/Result.java | 25 ++++++-- .../ProcessDefinitionControllerTest.java | 74 +++++++++++----------- .../service/registry/RegistryCenter.java | 5 +- .../src/main/resources/registry.properties | 16 ++--- 8 files changed, 87 insertions(+), 72 deletions(-)
