[incubator-skywalking] branch fix-v6-LICENSE updated (6d597f0 -> 1c2fc43)

[wu...@apache.org]

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

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


    from 6d597f0  Add LICENSE full text into source license and remove NOTICE
     add f75270b  v6 startup successful. (#1625)
     new 1c2fc43  Merge branch 'master' into fix-v6-LICENSE

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../core/alarm/provider/AlarmModuleProvider.java   | 24 ++++++++--------------
 .../src/main}/resources/alarm-settings.yml         |  6 +++---
 2 files changed, 12 insertions(+), 18 deletions(-)
 copy oap-server/{server-alarm-plugin/src/test => server-starter/src/main}/resources/alarm-settings.yml (95%)

[incubator-skywalking] 01/01: Merge branch 'master' into fix-v6-LICENSE

[wu...@apache.org]

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

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

commit 1c2fc43dd8aafdcb3c4d3796b0eda0e70967fef3
Merge: 6d597f0 f75270b
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Tue Sep 4 21:41:31 2018 +0800

    Merge branch 'master' into fix-v6-LICENSE

 .../core/alarm/provider/AlarmModuleProvider.java   | 24 +++++-------
 .../src/main/resources/alarm-settings.yml          | 44 ++++++++++++++++++++++
 2 files changed, 53 insertions(+), 15 deletions(-)