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 33447c70e5eb34cf6d3ce40a8f91df0a7e78e5f2
Merge: f19b472 658376a
Author: lenboo <[email protected]>
AuthorDate: Fri Jan 29 11:25:38 2021 +0800

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

 .../dolphinscheduler/alert/runner/AlertSender.java | 11 +--
 .../apache/dolphinscheduler/api/enums/Status.java  |  1 +
 .../impl/AlertPluginInstanceServiceImpl.java       | 23 +++++
 .../service/AlertPluginInstanceServiceTest.java    | 99 ++++++++++++++++++++++
 .../dao/entity/AlertPluginInstance.java            |  3 +-
 .../dao/mapper/AlertGroupMapper.java               |  6 ++
 .../dao/mapper/AlertGroupMapper.xml                |  7 ++
 pom.xml                                            |  1 +
 8 files changed, 145 insertions(+), 6 deletions(-)

Reply via email to