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/05/02 16:28:38 UTC
[incubator-skywalking-ui] 02/03: Merge branch '5.0.0/beta' of
https://github.com/apache/incubator-skywalking-ui into 5.0.0/beta
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch 5.0.0/beta
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git
commit 6cb338769c318e27d0d14697efcc1cb65d9b405f
Merge: 6cbd1f2 746b336
Author: gaohongtao <ha...@gmail.com>
AuthorDate: Thu May 3 00:22:55 2018 +0800
Merge branch '5.0.0/beta' of https://github.com/apache/incubator-skywalking-ui into 5.0.0/beta
mock/server.js | 8 ++++---
mock/service.js | 6 +++---
src/components/GlobalHeader/index.js | 4 ++--
src/components/ServerLitePanel/index.js | 6 +++---
src/components/Topology/AppTopology.js | 27 +-----------------------
src/components/Topology/ServiceTopology.js | 26 +----------------------
src/components/TraceStack/index.js | 2 +-
src/models/alarm.js | 2 +-
src/models/application.js | 24 ++++++++++++---------
src/models/dashboard.js | 2 +-
src/models/service.js | 8 +++----
src/routes/Application/Application.js | 10 ++++-----
src/routes/Application/Server.js | 34 +++++++++++++++++++++++-------
src/routes/Dashboard/Dashboard.js | 10 ++++-----
src/routes/Service/Service.js | 12 +++++------
src/routes/Topology/Topology.js | 6 +++---
16 files changed, 81 insertions(+), 106 deletions(-)
--
To stop receiving notification emails like this one, please contact
hanahmily@apache.org.