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/05 16:39:49 UTC

[incubator-skywalking] 01/01: Merge branch 'master' into fix/src-release-script

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

wusheng pushed a commit to branch fix/src-release-script
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git

commit d554d2693f110a8c837f7c3881942205c1e9794e
Merge: 3276a4c 6a7e344
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Thu Jul 5 09:39:36 2018 -0700

    Merge branch 'master' into fix/src-release-script

 .../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 ++++++++++++-
 docs/en/How-to-release.md                          | 14 +++++------
 tools/releasing/create_source_release.sh           |  2 +-
 8 files changed, 40 insertions(+), 32 deletions(-)