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 d1a0d585ccc30886731d8552aab8522dcc966c6d Merge: d67b335 3dc4bdc Author: lenboo <[email protected]> AuthorDate: Wed Jan 13 14:30:04 2021 +0800 Merge remote-tracking branch 'upstream/dev' into json-split .../dao/entity/ProcessAlertContent.java | 28 +++++++++++++++++++++- .../dolphinscheduler/dao/mapper/ProjectMapper.java | 15 ++++++++++-- .../dolphinscheduler/dao/mapper/ProjectMapper.xml | 12 ++++++++++ .../server/master/runner/MasterExecThread.java | 4 +++- .../server/utils/AlertManager.java | 17 +++++++++---- .../server/master/AlertManagerTest.java | 10 ++++++-- .../service/process/ProcessService.java | 10 ++++++++ 7 files changed, 86 insertions(+), 10 deletions(-)
