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/04/29 23:51:41 UTC

[incubator-skywalking] 01/01: Merge branch 'master' into doc/optional-plugin

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

wusheng pushed a commit to branch doc/optional-plugin
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git

commit f8cd3a2841755c31a16c59edcfd775502eb98b9e
Merge: 468f018 2deb084
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Mon Apr 30 07:51:38 2018 +0800

    Merge branch 'master' into doc/optional-plugin

 .../jetty/provider/handler/reader/LogJsonReader.java     |  5 +++++
 docs/cn/Trace-Data-Protocol-CN.md                        | 16 ++++++++--------
 docs/en/Trace-Data-Protocol.md                           | 16 ++++++++--------
 3 files changed, 21 insertions(+), 16 deletions(-)

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