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/02/06 06:28:11 UTC
[incubator-dolphinscheduler] branch json_split updated (6e01d65 ->
5073510)
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 6e01d65 Merge remote-tracking branch 'upstream/dev' into spilit
add 9a38534 Improvement/UI no #3725 (#4316)
add e3902bf [Fix-4640][UI] Fixed a 404 error when the project name contains "http" (#4688)
add 24ddd4f [Improvement][UI] Improve parameter (#4673)
add 143fca1 [dev][cherry-pick-4660][ui]Fix too many resources to display (#4664)
add 03c7e1f [Fix][UDF] Fix udf jar path not exist when fs.defaultFS starts with file:/// (#4692)
add 369ff6f first PR (#4699)
add 773909e [Improvement][Common] Add more resource suffix (#4683)
new 5073510 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:
.../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(-)
[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 5073510119f6fd15604514ef4e210be18fdb991e
Merge: 6e01d65 773909e
Author: lenboo <ba...@gmail.com>
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(-)