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/03/09 23:39:46 UTC

[incubator-skywalking] branch 5.0-live-demo updated (4b05b9a -> 3c4efdb)

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

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


    from 4b05b9a  Merge branch 'master' into 5.0-live-demo
     add 6fa179e  Fixed #904. (#923)
     new 3c4efdb  Merge branch 'master' into 5.0-live-demo

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:
 .../storage/es/dao/ui/InstanceEsUIDAO.java         | 38 +++++++++++++++++-----
 .../apm/collector/ui/utils/DurationTestCase.java}  | 26 ++++++++++-----
 2 files changed, 48 insertions(+), 16 deletions(-)
 copy apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/{main/java/org/apache/skywalking/apm/collector/ui/utils/ApdexCalculator.java => test/java/org/apache/skywalking/apm/collector/ui/utils/DurationTestCase.java} (58%)

-- 
To stop receiving notification emails like this one, please contact
wusheng@apache.org.

[incubator-skywalking] 01/01: Merge branch 'master' into 5.0-live-demo

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

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

commit 3c4efdbe257aecb3a6fa3f1b0a72119c4cfed307
Merge: 4b05b9a 6fa179e
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Sat Mar 10 07:39:43 2018 +0800

    Merge branch 'master' into 5.0-live-demo

 .../storage/es/dao/ui/InstanceEsUIDAO.java         | 38 +++++++++++++++----
 .../apm/collector/ui/utils/DurationTestCase.java   | 44 ++++++++++++++++++++++
 2 files changed, 74 insertions(+), 8 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
wusheng@apache.org.