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/03/05 09:06:24 UTC
[incubator-skywalking-ui] 05/05: Merge branch 'master' into
docs/5.0.0
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch docs/5.0.0
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git
commit 814adc2dc1fb51d870daa6f495f374d08e7c60c2
Merge: 66e5417 e36a6bf
Author: hanahmily <ha...@gmail.com>
AuthorDate: Mon Mar 5 17:05:11 2018 +0800
Merge branch 'master' into docs/5.0.0
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
hanahmily@apache.org.