This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch sync-ui in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit c6dce72be4de96e6e84a4b930602f1d7f0ea6fb7 Merge: fd3d5ad e7b3014 Author: 吴晟 Wu Sheng <[email protected]> AuthorDate: Sun Mar 4 06:58:35 2018 +0800 Merge branch 'master' into sync-ui .../provider/handler/JVMMetricsServiceHandler.java | 9 +++++++++ .../ServiceNameDiscoveryServiceHandler.java | 2 +- .../define/service/IServiceNameService.java | 3 +++ .../provider/service/ServiceNameService.java | 4 ++++ .../define/decorator/ReferenceDecorator.java | 1 + .../storage/es/dao/ui/MemoryMetricEsUIDAO.java | 8 +++++++- .../storage/h2/dao/ui/MemoryMetricH2UIDAO.java | 7 ++++++- .../apm/collector/ui/query/TraceQuery.java | 6 +++--- .../collector/ui/service/ApplicationService.java | 14 ++++++++------ .../collector/ui/service/SecondBetweenService.java | 6 +++++- .../apm/collector/ui/service/ServerService.java | 20 ++++++++++++-------- .../ui/service/ServiceTopologyService.java | 4 ++-- .../apm/collector/ui/utils/ApdexCalculator.java | 6 +++++- .../core/dictionary/OperationNameDictionary.java | 22 +++++++++++++++++++--- 14 files changed, 85 insertions(+), 27 deletions(-) -- To stop receiving notification emails like this one, please contact [email protected].
