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/01/15 02:11:36 UTC
[incubator-dolphinscheduler] branch json_split updated (a7d396f ->
c3d1812)
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 a7d396f Merge remote-tracking branch 'upstream/dev' into json-split
add 2a98aee [FEATURE-4451][API]After the workflow editing page is submitted, the user chooses whether to go online or not. 0 means not to go online, 1 means online. (#4437)
add d0ac87a [Feature-4428][dao、UI] It is recommended to add an owner in the data source center and the Resource Center to make it easier to manage (#4442)
add fb5501f [Fix-4455][common] fix parse shell output (#4456)
add b6ce3cf [FIX][UT]testVerifyTenantCode assert error (#4460)
new c3d1812 Merge remote-tracking branch 'upstream/dev' into json-split
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:
.../controller/ProcessDefinitionController.java | 267 +++++++++++----------
.../ProcessDefinitionControllerTest.java | 3 +-
.../api/service/TenantServiceTest.java | 18 +-
.../common/shell/ShellExecutor.java | 2 +-
.../dao/mapper/DataSourceMapper.xml | 9 +-
.../dolphinscheduler/dao/mapper/ResourceMapper.xml | 15 +-
.../pages/datasource/pages/list/_source/list.vue | 1 +
.../pages/file/pages/list/_source/list.vue | 1 +
.../src/js/module/i18n/locale/en_US.js | 4 +-
.../src/js/module/i18n/locale/zh_CN.js | 4 +-
10 files changed, 170 insertions(+), 154 deletions(-)
[incubator-dolphinscheduler] 01/01: Merge remote-tracking branch
'upstream/dev' into json-split
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 c3d18127be526d6ba560077707c62fff0b9dc869
Merge: a7d396f b6ce3cf
Author: lenboo <ba...@gmail.com>
AuthorDate: Fri Jan 15 10:11:09 2021 +0800
Merge remote-tracking branch 'upstream/dev' into json-split
.../controller/ProcessDefinitionController.java | 267 +++++++++++----------
.../ProcessDefinitionControllerTest.java | 3 +-
.../api/service/TenantServiceTest.java | 18 +-
.../common/shell/ShellExecutor.java | 2 +-
.../dao/mapper/DataSourceMapper.xml | 9 +-
.../dolphinscheduler/dao/mapper/ResourceMapper.xml | 15 +-
.../pages/datasource/pages/list/_source/list.vue | 1 +
.../pages/file/pages/list/_source/list.vue | 1 +
.../src/js/module/i18n/locale/en_US.js | 4 +-
.../src/js/module/i18n/locale/zh_CN.js | 4 +-
10 files changed, 170 insertions(+), 154 deletions(-)