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 5073510119f6fd15604514ef4e210be18fdb991e Merge: 6e01d65 773909e Author: lenboo <[email protected]> AuthorDate: Sat Feb 6 14:27:50 2021 +0800 Merge remote-tracking branch 'upstream/dev' into spilit .../apache/dolphinscheduler/common/Constants.java | 2 +- .../src/main/resources/common.properties | 2 +- .../server/master/runner/MasterTaskExecThread.java | 4 +- .../dolphinscheduler/server/utils/UDFUtils.java | 6 +- .../pages/dag/_source/formModel/tasks/flink.vue | 38 +++++++---- .../home/pages/dag/_source/formModel/tasks/mr.vue | 16 ++--- .../pages/dag/_source/formModel/tasks/spark.vue | 78 +++++++++++++--------- .../pages/definition/pages/list/_source/list.vue | 2 +- .../pages/instance/pages/list/_source/list.vue | 2 +- .../projects/pages/taskInstance/_source/list.vue | 2 +- .../resource/pages/file/pages/_source/common.js | 2 +- .../src/js/module/components/transfer/resource.vue | 11 ++- .../src/js/module/i18n/locale/en_US.js | 34 +++++----- .../src/js/module/i18n/locale/zh_CN.js | 44 ++++++------ dolphinscheduler-ui/src/js/module/io/index.js | 2 +- 15 files changed, 139 insertions(+), 106 deletions(-)
