You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by pe...@apache.org on 2018/04/23 06:40:35 UTC
[incubator-skywalking] 01/01: Merge branch 'master' into
ui-protocol/cpm
This is an automated email from the ASF dual-hosted git repository.
pengys pushed a commit to branch ui-protocol/cpm
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 74fd4cec76aae2d6e14fb0867aa267e337ec8a6b
Merge: 6fad260 4b96bc0
Author: 彭勇升 pengys <80...@qq.com>
AuthorDate: Mon Apr 23 14:40:32 2018 +0800
Merge branch 'master' into ui-protocol/cpm
.../std/ResponseTimeDistributionSpanListener.java | 21 ++--
...sponseTimeDistributionSpanListenerTestCase.java | 26 ++++-
.../configuration/ConfigurationModule.java | 3 +-
.../IResponseTimeDistributionConfigService.java | 31 ++++++
.../configuration/ConfigurationModuleConfig.java | 18 ++++
.../configuration/ConfigurationModuleProvider.java | 20 ++--
.../ResponseTimeDistributionConfigService.java | 41 ++++++++
.../apm/collector/storage/StorageModule.java | 2 +
.../dao/ui/IResponseTimeDistributionUIDAO.java | 106 +++++++++++++++++++++
.../storage/es/StorageModuleEsProvider.java | 3 +
.../es/dao/ui/ResponseTimeDistributionEsUIDAO.java | 72 ++++++++++++++
.../storage/h2/StorageModuleH2Provider.java | 7 +-
.../h2/dao/ui/ResponseTimeDistributionH2UIDAO.java | 39 ++++++++
apm-collector/apm-collector-storage/pom.xml | 5 +
.../apm/collector/ui/query/OverViewLayerQuery.java | 14 ++-
.../service/ResponseTimeDistributionService.java | 91 ++++++++++++++++++
16 files changed, 480 insertions(+), 19 deletions(-)
--
To stop receiving notification emails like this one, please contact
pengys@apache.org.