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/02 08:53:49 UTC

[incubator-dolphinscheduler] 01/01: Merge remote-tracking branch 'upstream/dev' into spilit

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 6844f67957a5f38dab4bf1f7fc3bb72558fd9ad7
Merge: 988649a 14d49bc
Author: lenboo <ba...@gmail.com>
AuthorDate: Tue Feb 2 16:53:28 2021 +0800

    Merge remote-tracking branch 'upstream/dev' into spilit

 .../api/service/ProcessInstanceService.java        |  10 +-
 .../service/impl/ProcessDefinitionServiceImpl.java |   4 +-
 .../task/conditions/ConditionsParameters.java      |  10 +-
 .../service/process/ProcessService.java            |  58 +++++++++++
 .../service/process/ProcessServiceTest.java        | 107 +++++++++++++++++++++
 .../formModel/tasks/_source/localParams.vue        |  12 +--
 .../pages/definition/pages/list/_source/start.vue  |   3 +-
 .../security/pages/users/_source/createUser.vue    |  22 ++++-
 8 files changed, 206 insertions(+), 20 deletions(-)