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/20 09:16:28 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 9b9952a29f2fee77b786a720a98f2c23ff3c7aa3
Merge: c184b89 17c06ce
Author: lenboo <ba...@gmail.com>
AuthorDate: Wed Jan 20 17:15:53 2021 +0800

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

 .../api/service/AlertGroupService.java             | 12 ++---
 .../dolphinscheduler/api/service/BaseService.java  |  6 +--
 .../dolphinscheduler/api/service/QueueService.java | 18 ++++----
 .../api/service/ResourcesService.java              | 28 ++++++------
 .../api/service/WorkerGroupService.java            |  2 +-
 .../service/impl/ProcessDefinitionServiceImpl.java | 42 ++---------------
 .../api/service/impl/ProjectServiceImpl.java       |  6 +--
 .../api/service/impl/TenantServiceImpl.java        | 14 +++---
 .../ProcessDefinitionControllerTest.java           |  2 +-
 .../formModel/tasks/_source/localParams.vue        | 12 +++--
 .../pages/definition/pages/list/_source/start.vue  | 52 ++++++++++++++++++++--
 11 files changed, 102 insertions(+), 92 deletions(-)