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/02/28 13:39:43 UTC

[incubator-skywalking] branch master updated (4057f37 -> 6fd9c3b)

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

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


    from 4057f37  Merge pull request #848 from peng-yongsheng/feature/getServerThroughput
     add d66f56a  Change the parameter name: Start -> startSecondTimeBucket End -> endSecondTimeBucket
     add a5216a9  1. Change the parameter name: Start -> startSecondTimeBucket End -> endSecondTimeBucket
     add 43ddc84  Merge branch 'master' into feature/searchServer
     new 6fd9c3b  Merge pull request #849 from peng-yongsheng/feature/searchServer

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:
 .../collector/storage/dao/ui/IInstanceUIDAO.java   |  2 +-
 .../storage/es/dao/ui/InstanceEsUIDAO.java         | 25 ++++++++++++++++------
 .../storage/h2/dao/ui/InstanceH2UIDAO.java         | 18 +++++++++-------
 .../apm/collector/ui/query/ServerQuery.java        | 12 +++++------
 .../apm/collector/ui/service/ServerService.java    |  8 +++----
 5 files changed, 39 insertions(+), 26 deletions(-)

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

[incubator-skywalking] 01/01: Merge pull request #849 from peng-yongsheng/feature/searchServer

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

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

commit 6fd9c3bda85394e6dc34b20a0f00507fedef5678
Merge: 4057f37 43ddc84
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Feb 28 21:39:41 2018 +0800

    Merge pull request #849 from peng-yongsheng/feature/searchServer
    
    "searchServer" and "getAllServer"

 .../collector/storage/dao/ui/IInstanceUIDAO.java   |  2 +-
 .../storage/es/dao/ui/InstanceEsUIDAO.java         | 25 ++++++++++++++++------
 .../storage/h2/dao/ui/InstanceH2UIDAO.java         | 18 +++++++++-------
 .../apm/collector/ui/query/ServerQuery.java        | 12 +++++------
 .../apm/collector/ui/service/ServerService.java    |  8 +++----
 5 files changed, 39 insertions(+), 26 deletions(-)

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