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

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

commit ab3615e237ca509757dab39e377e8b391a35c901
Merge: 2cef97a 37a5287
Author: 吴晟 Wu Sheng <wu.sh...@foxmail.com>
AuthorDate: Tue Feb 13 23:08:25 2018 +0800

    Merge pull request #818 from peng-yongsheng/feature/metric_check
    
    Agent data aggregate test.

 .../ApplicationRegisterServiceHandlerTestCase.java |  46 ------
 .../handler/JVMMetricServiceHandlerTestCase.java   |  94 ------------
 .../AgentDataMock.java}                            |  30 ++--
 .../grpc/provider/handler/mock/JVMMetricMock.java  | 159 +++++++++++++++++++++
 .../grpc/provider/handler/mock/TimeBuilder.java    |   2 +-
 .../provider/handler/mock/TraceSegmentMock.java    |  34 +----
 .../alarm/provider/worker/AlarmAssertWorker.java   |  31 ++--
 .../ApplicationMetricAlarmListCopy.java            |   1 -
 .../src/main/resources/log4j2.xml                  |   4 +-
 .../es/base/dao/AbstractPersistenceEsDAO.java      |   4 +-
 .../collector/storage/es/base/dao/BatchEsDAO.java  |   4 +
 ...stractApplicationComponentEsPersistenceDAO.java |   2 -
 ...stractApplicationAlarmListEsPersistenceDAO.java |   1 -
 .../AbstractApplicationMetricEsPersistenceDAO.java |   2 -
 ...AbstractApplicationMappingEsPersistenceDAO.java |   2 -
 ...ApplicationReferenceMetricEsPersistenceDAO.java |   2 -
 .../cpump/AbstractCpuMetricEsPersistenceDAO.java   |   2 -
 .../dao/gcmp/AbstractGCMetricEsPersistenceDAO.java |   2 -
 .../AbstractInstanceMetricEsPersistenceDAO.java    |   2 -
 .../AbstractInstanceMappingEsPersistenceDAO.java   |   2 -
 ...actInstanceReferenceMetricEsPersistenceDAO.java |   2 -
 .../AbstractMemoryMetricEsPersistenceDAO.java      |   2 -
 .../AbstractMemoryPoolMetricEsPersistenceDAO.java  |   2 -
 .../smp/AbstractServiceMetricEsPersistenceDAO.java |   2 -
 ...ractServiceReferenceMetricEsPersistenceDAO.java |   2 -
 ...stractApplicationComponentH2PersistenceDAO.java |   1 +
 ...stractApplicationAlarmListH2PersistenceDAO.java |   1 +
 .../AbstractApplicationMetricH2PersistenceDAO.java |   1 +
 ...AbstractApplicationMappingH2PersistenceDAO.java |   1 +
 ...ApplicationReferenceMetricH2PersistenceDAO.java |   1 +
 .../cpump/AbstractCpuMetricH2PersistenceDAO.java   |   1 +
 .../dao/gcmp/AbstractGCMetricH2PersistenceDAO.java |   1 +
 .../AbstractInstanceMetricH2PersistenceDAO.java    |   3 +-
 .../AbstractInstanceMappingH2PersistenceDAO.java   |   1 +
 ...actInstanceReferenceMetricH2PersistenceDAO.java |   1 +
 .../AbstractMemoryMetricH2PersistenceDAO.java      |   1 +
 .../AbstractMemoryPoolMetricH2PersistenceDAO.java  |   1 +
 .../smp/AbstractServiceMetricH2PersistenceDAO.java |   1 +
 ...ractServiceReferenceMetricH2PersistenceDAO.java |   1 +
 39 files changed, 220 insertions(+), 232 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
wush...@apache.org.

Reply via email to