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/12 02:39:21 UTC

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

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 d67b33514bd78504c5451f58f814cba82b96afcf
Merge: 58a9e12 83d5350
Author: lenboo <ba...@gmail.com>
AuthorDate: Tue Jan 12 10:38:47 2021 +0800

    Merge remote-tracking branch 'upstream/dev' into json-split

 .../api/controller/ExecutorController.java           | 16 +++++++++++-----
 .../api/service/ExecutorService.java                 | 13 ++++++++++---
 .../api/service/ExecutorService2Test.java            | 16 ++++++++--------
 .../apache/dolphinscheduler/common/Constants.java    |  2 ++
 .../common/utils/ParameterUtilsTest.java             | 20 ++++++++++++++++++++
 .../service/process/ProcessService.java              | 19 +++++++++++++++++++
 .../service/process/ProcessServiceTest.java          | 15 ++++++++++++++-
 7 files changed, 84 insertions(+), 17 deletions(-)