Merge branch 'master' of https://github.com/wu-sheng/sky-walking

# Conflicts: # skywalking-webui/src/main/webapp/pages/common/traceInfo.ftl
2017-02-08 17:28:02 +08:00 · 2017-02-08 17:28:02 +08:00 · c90f86137b
parent c673937342 a75bccabf8
commit c90f86137b
5 changed files with 5 additions and 5 deletions
--- a/README.md
+++ b/README.md
@ -71,17 +71,17 @@ ___


 # Quick View
-* distributed tracer
+* distributed trace

-![追踪连路图1](docs/resources/callChain.png)
+![追踪连路图1](docs/resources/callChain.png?1=1)

-![追踪连路图2](docs/resources/callChainDetail.png)
+![追踪连路图2](docs/resources/callChainDetail.png?1=1)

-![追踪连路图3](docs/resources/callChainLog.png)
+![追踪连路图3](docs/resources/callChainLog.png?1=1)

 * alarm mail

-![告警邮件](docs/resources/alarmMail.png)
+![告警邮件](docs/resources/alarmMail.png?1=1)

 # Document
 * [WIKI](https://github.com/wu-sheng/sky-walking/wiki)
--- a/docs/resources/callChain.png
+++ b/docs/resources/callChain.png
--- a/docs/resources/callChainDetail.png
+++ b/docs/resources/callChainDetail.png
--- a/docs/resources/callChainLog.png
+++ b/docs/resources/callChainLog.png
--- a/docs/resources/demo-application-cluster-tracer.jpg
+++ b/docs/resources/demo-application-cluster-tracer.jpg