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/07/11 21:52:20 UTC
[incubator-skywalking] 01/01: Merge branch 'master' into
release/5.0.0-beta2
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch release/5.0.0-beta2
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit dfe3c41eb559371d22cfd954ed63370db17de067
Merge: 06e87de ccf5ef4
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Jul 11 14:52:17 2018 -0700
Merge branch 'master' into release/5.0.0-beta2
NOTICE | 8 +-
.../collector/storage/dao/ui/IGCMetricUIDAO.java | 6 +-
.../storage/es/dao/ui/GCMetricEsUIDAO.java | 2 +-
.../storage/h2/dao/ui/GCMetricH2UIDAO.java | 2 +-
.../dao/ui/GCMetricShardingjdbcUIDAO.java | 28 +++---
.../zipkin/provider/ZipkinReceiverProvider.java | 2 +
.../zipkin/provider/handler/SpanProcessor.java | 16 +++-
apm-dist/release-docs/NOTICE | 7 ++
apm-webapp/pom.xml | 6 ++
.../apm/webapp/proxy/NIWSServerListTest.java | 95 +++++++++++++++++++++
docs/cn/Deploy-backend-in-cluster-mode-CN.md | 99 +++++++++++++---------
docs/cn/Deploy-backend-in-standalone-mode-CN.md | 27 +++---
docs/cn/Deploy-skywalking-agent-CN.md | 69 +++------------
docs/cn/Quick-start-CN.md | 27 ++++--
docs/en/How-to-release.md | 14 +--
pom.xml | 2 +
skywalking-ui | 2 +-
tools/releasing/create_source_release.sh | 6 +-
18 files changed, 271 insertions(+), 147 deletions(-)