You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/04/24 00:12:49 UTC

[incubator-skywalking] 01/01: Merge branch 'master' into beta-changes

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

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

commit ffd7d76af9ec7f604dca91d9f1f47e04cf4c4b69
Merge: bf9a53e 368a5f4
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Tue Apr 24 08:12:45 2018 +0800

    Merge branch 'master' into beta-changes

 .../collector/storage/es/DataTTLKeeperTimer.java   | 209 ++++++++++++++++-----
 .../es/base/dao/AbstractPersistenceEsDAO.java      |   5 +-
 .../InstanceReferenceAlarmEsPersistenceDAO.java    |   4 -
 ...InstanceReferenceDayMetricEsPersistenceDAO.java |   4 -
 ...nstanceReferenceHourMetricEsPersistenceDAO.java |   4 -
 ...stanceReferenceMonthMetricEsPersistenceDAO.java |   4 -
 .../storage/es/DataTTLKeeperTimerTestCase.java     |  68 +++++++
 7 files changed, 233 insertions(+), 65 deletions(-)

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