This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch update/logbck-version in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit efcc8e856cd777eb48fe516f75060617086fcf4b Merge: 4544d99 ab3615e Author: 吴晟 Wu Sheng <wu.sh...@foxmail.com> AuthorDate: Tue Feb 13 23:09:09 2018 +0800 Merge branch 'master' into update/logbck-version .../handler/InstanceDiscoveryServiceHandler.java | 2 + .../ApplicationRegisterServiceHandlerTestCase.java | 46 ------ .../handler/JVMMetricServiceHandlerTestCase.java | 94 ----------- .../AgentDataMock.java} | 30 ++-- .../grpc/provider/handler/mock/JVMMetricMock.java | 159 +++++++++++++++++++ .../grpc/provider/handler/mock/RegisterMock.java | 176 +++++++++++++++++++++ .../grpc/provider/handler/mock/TimeBuilder.java | 2 +- .../provider/handler/mock/TraceSegmentMock.java | 28 +--- .../alarm/provider/worker/AlarmAssertWorker.java | 31 ++-- .../ApplicationMetricAlarmListCopy.java | 1 - .../register/ApplicationRegisterSerialWorker.java | 9 +- .../register/InstanceRegisterSerialWorker.java | 9 +- .../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 - .../es/dao/cache/ApplicationEsCacheDAO.java | 4 +- .../storage/es/dao/cache/InstanceEsCacheDAO.java | 4 +- .../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 + 45 files changed, 418 insertions(+), 232 deletions(-) -- To stop receiving notification emails like this one, please contact wush...@apache.org.