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/14 13:47:52 UTC
[incubator-dolphinscheduler] branch json_split updated (22ec6c0 ->
c33cc87)
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 22ec6c0 [Feature][jsonsplit]Refactor process lineage (#5034)
add cc2a94a [Improvement-4988][docs] Uppercase the first letter the state of Process Instance (#4990)
add a3153b5 [Bug][Master] Fix First master fault tolerance when startup (#5045)
new c33cc87 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:
.../dolphinscheduler/server/zk/ZKMasterClient.java | 7 ++-----
.../src/js/conf/home/pages/dag/_source/config.js | 6 +++---
.../home/pages/dag/_source/formModel/formModel.vue | 4 ++--
.../dag/_source/formModel/tasks/_source/commcon.js | 4 ++--
.../formModel/tasks/_source/dependItemList.vue | 8 ++++----
.../_source/formModel/tasks/_source/httpParams.vue | 2 +-
.../_source/formModel/tasks/_source/localParams.vue | 2 +-
.../_source/formModel/tasks/_source/nodeStatus.vue | 8 ++++----
.../formModel/tasks/_source/statementList.vue | 2 +-
.../pages/dag/_source/formModel/tasks/conditions.vue | 2 +-
.../pages/dag/_source/formModel/tasks/dependent.vue | 2 +-
.../pages/datasource/pages/list/_source/list.vue | 2 +-
.../pages/_source/conditions/instance/common.js | 8 ++++----
.../_source/conditions/instance/processInstance.vue | 2 +-
.../_source/conditions/instance/taskInstance.vue | 2 +-
.../_source/taskRecordList/_source/conditions.vue | 12 ++++++------
.../pages/definition/pages/list/_source/list.vue | 4 ++--
.../pages/definition/pages/list/_source/timing.vue | 4 ++--
.../pages/definition/pages/list/_source/versions.vue | 2 +-
.../pages/definition/timing/_source/list.vue | 2 +-
.../pages/instance/pages/list/_source/list.vue | 4 ++--
.../home/pages/projects/pages/list/_source/list.vue | 2 +-
.../resource/pages/file/pages/list/_source/list.vue | 2 +-
.../pages/file/pages/subdirectory/_source/list.vue | 2 +-
.../pages/udf/pages/function/_source/list.vue | 2 +-
.../pages/udf/pages/resource/_source/list.vue | 2 +-
.../pages/udf/pages/subUdfDirectory/_source/list.vue | 2 +-
.../pages/security/pages/tenement/_source/list.vue | 2 +-
.../home/pages/security/pages/users/_source/list.vue | 2 +-
.../security/pages/warningGroups/_source/list.vue | 2 +-
.../security/pages/warningInstance/_source/list.vue | 2 +-
.../home/pages/user/pages/token/_source/list.vue | 2 +-
.../src/js/module/i18n/locale/en_US.js | 20 +++++++++-----------
.../src/js/module/i18n/locale/zh_CN.js | 20 +++++++++-----------
34 files changed, 72 insertions(+), 79 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 c33cc87af497d394083ede910d0fb69c3d91ce8d
Merge: 22ec6c0 a3153b5
Author: lenboo <ba...@gmail.com>
AuthorDate: Sun Mar 14 21:47:30 2021 +0800
Merge remote-tracking branch 'upstream/dev' into spilit
.../dolphinscheduler/server/zk/ZKMasterClient.java | 7 ++-----
.../src/js/conf/home/pages/dag/_source/config.js | 6 +++---
.../home/pages/dag/_source/formModel/formModel.vue | 4 ++--
.../dag/_source/formModel/tasks/_source/commcon.js | 4 ++--
.../formModel/tasks/_source/dependItemList.vue | 8 ++++----
.../_source/formModel/tasks/_source/httpParams.vue | 2 +-
.../_source/formModel/tasks/_source/localParams.vue | 2 +-
.../_source/formModel/tasks/_source/nodeStatus.vue | 8 ++++----
.../formModel/tasks/_source/statementList.vue | 2 +-
.../pages/dag/_source/formModel/tasks/conditions.vue | 2 +-
.../pages/dag/_source/formModel/tasks/dependent.vue | 2 +-
.../pages/datasource/pages/list/_source/list.vue | 2 +-
.../pages/_source/conditions/instance/common.js | 8 ++++----
.../_source/conditions/instance/processInstance.vue | 2 +-
.../_source/conditions/instance/taskInstance.vue | 2 +-
.../_source/taskRecordList/_source/conditions.vue | 12 ++++++------
.../pages/definition/pages/list/_source/list.vue | 4 ++--
.../pages/definition/pages/list/_source/timing.vue | 4 ++--
.../pages/definition/pages/list/_source/versions.vue | 2 +-
.../pages/definition/timing/_source/list.vue | 2 +-
.../pages/instance/pages/list/_source/list.vue | 4 ++--
.../home/pages/projects/pages/list/_source/list.vue | 2 +-
.../resource/pages/file/pages/list/_source/list.vue | 2 +-
.../pages/file/pages/subdirectory/_source/list.vue | 2 +-
.../pages/udf/pages/function/_source/list.vue | 2 +-
.../pages/udf/pages/resource/_source/list.vue | 2 +-
.../pages/udf/pages/subUdfDirectory/_source/list.vue | 2 +-
.../pages/security/pages/tenement/_source/list.vue | 2 +-
.../home/pages/security/pages/users/_source/list.vue | 2 +-
.../security/pages/warningGroups/_source/list.vue | 2 +-
.../security/pages/warningInstance/_source/list.vue | 2 +-
.../home/pages/user/pages/token/_source/list.vue | 2 +-
.../src/js/module/i18n/locale/en_US.js | 20 +++++++++-----------
.../src/js/module/i18n/locale/zh_CN.js | 20 +++++++++-----------
34 files changed, 72 insertions(+), 79 deletions(-)