You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/08/31 11:40:05 UTC

[incubator-skywalking] branch 6.0 updated (7b55101 -> eb96151)

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

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


    from 7b55101  Update root pom to apache 21.
     add cfee02c  [TRIVIAL] fix TYPO (#1616)
     add 9275eea   FIx NPE in InstanceMetricAlarmAssertWorker (#1614)
     new eb96151  Merge commit '9275eeaa7a7b4a8b24955728338a928ad902686d' into 6.0

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:
 .../alarm/provider/worker/instance/InstanceMetricAlarmAssertWorker.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[incubator-skywalking] 01/01: Merge commit '9275eeaa7a7b4a8b24955728338a928ad902686d' into 6.0

Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit eb96151c95084553401ce11d88ba5fbde227254a
Merge: 7b55101 9275eea
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Fri Aug 31 19:39:28 2018 +0800

    Merge commit '9275eeaa7a7b4a8b24955728338a928ad902686d' into 6.0
    
    # Conflicts:
    #	docs/powered-by.md

 .../alarm/provider/worker/instance/InstanceMetricAlarmAssertWorker.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)