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/06 19:00:06 UTC
[incubator-skywalking] branch 6.0 updated (e6ca91c -> e3f4e02)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch 6.0
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from e6ca91c Init branch 6.0 for our next big iteration. Change root readme. Format field document in table. Remove Chinese documents.
add 1e0d932 Fixed the wrong usage of elasticsearch filter. (#1396)
add 8b385d0 Submodule/ui (#1397)
add 9b14d59 [Collector] Segment duration query error. (#1400)
add 8046aa0 Submodule/ui (#1402)
add 621ed2c [Collector] Add application id into service metric for UI (#1406)
add 5f239f5 Submodule/ui (#1408)
add b23ca45 #1410 (#1411)
add 3782b7a Submodule/ui (#1412)
add 8a1efb9 Add username/password for beta2 demo UI (#1413)
add c1efe6c Update 5.0.0-beta2 screen snapshot (#1414)
add fc87747 Format release doc (#1417)
add 5941e72 #1425 (#1426)
add 6a7e344 fix zipkin provider can not receive full spans data (#1420)
add 02ab74a Update create_source_release.sh (#1431)
new e3f4e02 Merge branch 'master' into 6.0
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.md | 1 +
README.md | 4 +++-
.../configuration/ConfigurationModuleProvider.java | 6 ++---
.../collector/storage/dao/ui/IGCMetricUIDAO.java | 6 ++---
.../storage/ui/service/ServiceMetric.java | 19 ++++++---------
.../es/dao/SegmentDurationEsPersistenceDAO.java | 2 +-
.../es/dao/ui/ApplicationComponentEsUIDAO.java | 2 +-
.../es/dao/ui/ApplicationMappingEsUIDAO.java | 2 +-
.../es/dao/ui/ApplicationMetricEsUIDAO.java | 6 ++---
.../dao/ui/ApplicationReferenceMetricEsUIDAO.java | 6 ++---
.../storage/es/dao/ui/GCMetricEsUIDAO.java | 2 +-
.../storage/es/dao/ui/InstanceEsUIDAO.java | 18 +++++++-------
.../storage/es/dao/ui/SegmentDurationEsUIDAO.java | 12 ++--------
.../storage/es/dao/ui/ServiceMetricEsUIDAO.java | 3 ++-
.../storage/h2/dao/ui/GCMetricH2UIDAO.java | 2 +-
.../dao/ui/GCMetricShardingjdbcUIDAO.java | 28 ++++++++--------------
.../dao/ui/ServiceMetricShardingjdbcUIDAO.java | 3 ++-
.../zipkin/provider/ZipkinReceiverProvider.java | 2 ++
.../zipkin/provider/handler/SpanProcessor.java | 16 ++++++++++++-
.../collector/ui/service/ApplicationService.java | 6 +++--
.../collector/ui/service/ServiceNameService.java | 6 +++--
.../ui/service/ApplicationServiceTest.java | 7 +++---
.../ui/service/ServiceNameServiceTest.java | 18 +++++++++++---
.../resources/ui-graphql/service-layer.graphqls | 3 +--
docs/Screenshots.md | 16 ++++++-------
docs/en/How-to-release.md | 14 +++++------
skywalking-ui | 2 +-
tools/releasing/create_source_release.sh | 6 ++++-
28 files changed, 119 insertions(+), 99 deletions(-)
[incubator-skywalking] 01/01: Merge branch 'master' into 6.0
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch 6.0
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit e3f4e021befe87c42d9f19cdbe2c690251c9e6f5
Merge: e6ca91c 02ab74a
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Fri Jul 6 11:59:57 2018 -0700
Merge branch 'master' into 6.0
# Conflicts:
# README_ZH.md
CHANGES.md | 1 +
README.md | 4 +++-
.../configuration/ConfigurationModuleProvider.java | 6 ++---
.../collector/storage/dao/ui/IGCMetricUIDAO.java | 6 ++---
.../storage/ui/service/ServiceMetric.java | 19 ++++++---------
.../es/dao/SegmentDurationEsPersistenceDAO.java | 2 +-
.../es/dao/ui/ApplicationComponentEsUIDAO.java | 2 +-
.../es/dao/ui/ApplicationMappingEsUIDAO.java | 2 +-
.../es/dao/ui/ApplicationMetricEsUIDAO.java | 6 ++---
.../dao/ui/ApplicationReferenceMetricEsUIDAO.java | 6 ++---
.../storage/es/dao/ui/GCMetricEsUIDAO.java | 2 +-
.../storage/es/dao/ui/InstanceEsUIDAO.java | 18 +++++++-------
.../storage/es/dao/ui/SegmentDurationEsUIDAO.java | 12 ++--------
.../storage/es/dao/ui/ServiceMetricEsUIDAO.java | 3 ++-
.../storage/h2/dao/ui/GCMetricH2UIDAO.java | 2 +-
.../dao/ui/GCMetricShardingjdbcUIDAO.java | 28 ++++++++--------------
.../dao/ui/ServiceMetricShardingjdbcUIDAO.java | 3 ++-
.../zipkin/provider/ZipkinReceiverProvider.java | 2 ++
.../zipkin/provider/handler/SpanProcessor.java | 16 ++++++++++++-
.../collector/ui/service/ApplicationService.java | 6 +++--
.../collector/ui/service/ServiceNameService.java | 6 +++--
.../ui/service/ApplicationServiceTest.java | 7 +++---
.../ui/service/ServiceNameServiceTest.java | 18 +++++++++++---
.../resources/ui-graphql/service-layer.graphqls | 3 +--
docs/Screenshots.md | 16 ++++++-------
docs/en/How-to-release.md | 14 +++++------
skywalking-ui | 2 +-
tools/releasing/create_source_release.sh | 6 ++++-
28 files changed, 119 insertions(+), 99 deletions(-)