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

Posted to notifications@skywalking.apache.org by wu...@apache.org on 2019/06/12 11:35:22 UTC

[skywalking] branch wu-sheng-patch-1 updated (8799e8c -> 54f4c11)

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

wusheng pushed a change to branch wu-sheng-patch-1
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


    from 8799e8c  Merge branch 'master' into wu-sheng-patch-1
     add 4e63331  #2860 (#2861)
     add 54f4c11  Merge branch 'master' into wu-sheng-patch-1

No new revisions were added by this update.

Summary of changes:
 .../{cluster/RemoteInstance.java => query/ID.java} | 28 +++++++++++--------
 .../oap/server/core/query/MetricQueryService.java  | 13 +++++----
 .../core/storage/query/IMetricsQueryDAO.java       |  5 ++--
 .../client/elasticsearch/ElasticSearchClient.java  |  7 -----
 .../elasticsearch/ITElasticSearchClient.java       |  8 +-----
 .../server/receiver/trace/mock/AgentDataMock.java  |  4 ++-
 .../plugin/elasticsearch/base/MetricsEsDAO.java    |  3 ++-
 .../plugin/elasticsearch/base/TimeSeriesUtils.java | 30 ++++++++++++---------
 .../elasticsearch/query/MetricsQueryEsDAO.java     | 31 ++++++++++++----------
 .../plugin/jdbc/h2/dao/H2MetricsQueryDAO.java      | 17 +++++++-----
 10 files changed, 77 insertions(+), 69 deletions(-)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{cluster/RemoteInstance.java => query/ID.java} (60%)