You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@skywalking.apache.org by ha...@apache.org on 2018/06/29 03:25:09 UTC

[incubator-skywalking-ui] 01/01: Merge pull request #185 from apache/5.0.0/beta2

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

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

commit be7cd13e89ac66a50ef48c1944f232967a1a0d26
Merge: bfc7d68 611711d
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Fri Jun 29 11:25:05 2018 +0800

    Merge pull request #185 from apache/5.0.0/beta2
    
    5.0.0/beta2

 mock/application.js                   |  2 +-
 mock/dashboard.js                     |  2 +-
 src/components/Page/Search/index.js   |  3 ++-
 src/models/application.js             |  8 ++++++--
 src/models/dashboard.js               |  8 ++++++--
 src/models/service.js                 | 13 +++++++++++++
 src/models/trace.js                   |  5 +++--
 src/routes/Application/Application.js |  7 +++++--
 src/routes/Dashboard/Dashboard.js     |  7 +++++--
 src/routes/Service/Service.js         |  5 +++--
 src/routes/Topology/Topology.js       | 11 ++++++++++-
 src/utils/models.js                   | 15 +++++++++++++++
 12 files changed, 70 insertions(+), 16 deletions(-)