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

wusheng pushed a commit to branch wu-sheng-patch-1
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git

commit 3f371103521cd0ebe2331b84bbaf8e54a8a9817f
Merge: 24cb483 8dda60e
Author: 吴晟 Wu Sheng <wu.sh...@foxmail.com>
AuthorDate: Wed Apr 11 11:43:12 2018 +0800

    Merge branch 'master' into wu-sheng-patch-1

 docs/README_ZH.md                               | 14 +++++---
 docs/cn/Application-toolkit-CN.md               |  4 +--
 docs/cn/Application-toolkit-logback-1.x-CN.md   |  2 +-
 docs/cn/Application-toolkit-trace-CN.md         |  2 +-
 docs/cn/Deploy-backend-in-standalone-mode-CN.md | 18 +++-------
 docs/cn/Deploy-skywalking-agent-CN.md           |  2 +-
 docs/cn/Direct-uplink-CN.md                     | 31 +++++++++++++++++
 docs/cn/FAQ/Kafka-plugin-CN.md                  |  2 +-
 docs/cn/Namespace-CN.md                         | 37 ++++++++++++++++++++
 docs/cn/Setting-override-CN.md                  | 34 +++++++++++++++++++
 docs/cn/TLS-CN.md                               | 44 ++++++++++++++++++++++++
 docs/cn/Token-auth-CN.md                        | 45 +++++++++++++++++++++++++
 docs/en/Application-toolkit-log4j-1.x.md        |  2 +-
 docs/en/Application-toolkit-log4j-2.x.md        |  2 +-
 docs/en/Application-toolkit-logback-1.x.md      |  4 +--
 docs/en/Applicaton-toolkit.md                   |  4 +--
 docs/en/Deploy-backend-in-standalone-mode.md    |  4 +--
 docs/en/Deploy-skywalking-agent.md              |  4 +--
 docs/en/Direct-uplink.md                        |  2 +-
 docs/en/FAQ/kafka-plugin.md                     |  2 +-
 docs/en/TLS.md                                  |  2 +-
 21 files changed, 225 insertions(+), 36 deletions(-)

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

Reply via email to