You are viewing a plain text version of this content. The canonical link for it is here.

Posted to notifications@skywalking.apache.org by wu...@apache.org on 2019/11/28 14:25:29 UTC

[skywalking] branch oal/apdex updated (5a9e72c -> 506f3dd)

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a change to branch oal/apdex
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


    from 5a9e72c  Merge branch 'master' into oal/apdex
     add b666dc7  MOD:alarm-settings.yml support exclude-names (#3949)
     add 506f3dd  Merge branch 'master' into oal/apdex

No new revisions were added by this update.

Summary of changes:
 docs/en/setup/backend/backend-alarm.md             |  4 +++
 .../oap/server/core/alarm/provider/AlarmRule.java  |  4 ++-
 .../server/core/alarm/provider/RulesReader.java    |  1 +
 .../server/core/alarm/provider/RunningRule.java    |  8 ++++++
 .../core/alarm/provider/AlarmRuleInitTest.java     |  2 ++
 .../core/alarm/provider/AlarmRulesWatcherTest.java |  6 ++++
 .../core/alarm/provider/RunningRuleTest.java       | 33 ++++++++++++++++++++++
 .../src/test/resources/alarm-settings.yml          |  2 ++
 8 files changed, 59 insertions(+), 1 deletion(-)