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 2018/10/28 13:15:08 UTC

[incubator-skywalking] branch fix-agent updated (51c3df5 -> 9f492b3)

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

wusheng pushed a change to branch fix-agent
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.


    from 51c3df5  Merge branch 'master' into fix-agent
     add 32b5c72  Set default dist alarm settings and make dist package setting files right.
     add 9f492b3  Merge branch 'fix-agent' of https://github.com/apache/incubator-skywalking into fix-agent

No new revisions were added by this update.

Summary of changes:
 .../server/core/alarm/provider/RunningRule.java    | 30 ++++++++++++---
 oap-server/server-starter/pom.xml                  |  2 +
 .../src/main/assembly/alarm-settings.yml           | 44 +++++++++++++++-------
 3 files changed, 56 insertions(+), 20 deletions(-)