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 <[email protected]> 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(-)
