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/05 03:32:00 UTC

[incubator-skywalking-ui] 01/01: Merge pull request #128 from apache/fix/e2e

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-ui.git

commit e36a6bf93503881a1d7abf7386558a776b3e2153
Merge: 8655c0d a21187c
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Mon Mar 5 11:31:57 2018 +0800

    Merge pull request #128 from apache/fix/e2e
    
    Fix/e2e

 mock/server.js                                     |   3 +-
 mock/trace.js                                      |   5 +-
 public/alert.svg                                   |   1 -
 public/database.svg                                |   1 -
 public/{ => img/icon}/alert.png                    | Bin
 public/{ => img/icon}/app.jpg                      | Bin
 public/{ => img/icon}/app.svg                      |   0
 public/{ => img/icon}/data.png                     | Bin
 public/img/icon/database.png                       | Bin 0 -> 6665 bytes
 public/{ => img/icon}/favicon.png                  | Bin
 public/img/icon/mq.png                             | Bin 0 -> 2412 bytes
 public/{ => img/icon}/service.svg                  |   0
 .../{FeignDefaultHttp.png => FEIGNDEFAULTHTTP.png} | Bin
 public/img/node/{NutzHttp.png => NUTZHTTP.png}     | Bin
 public/img/node/{NutzMvc.png => NUTZMVC.png}       | Bin
 public/img/node/{Oracle.png => ORACLE.png}         | Bin
 public/img/node/{tomcat.png => TOMCAT.png}         | Bin
 public/redis.svg                                   |   1 -
 src/components/Topology/AppTopology.js             |   4 +-
 src/components/Topology/ServiceTopology.js         |   2 +-
 src/components/TraceTable/index.js                 |  60 +++++++++++++++++----
 src/models/trace.js                                |  10 ++--
 src/routes/Dashboard/Dashboard.js                  |  10 ++--
 src/routes/Server/Server.js                        |  10 ++--
 src/routes/Trace/Trace.js                          |  15 ++----
 25 files changed, 80 insertions(+), 42 deletions(-)

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