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

Posted to notifications@skywalking.apache.org by ha...@apache.org on 2018/10/26 08:05:11 UTC

[incubator-skywalking] 02/04: Merge remote-tracking branch 'origin/master'

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

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

commit 841c1f8bbf6ee5ee048ba79960593487d47f6887
Merge: 863f7d4 24e958f
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Fri Oct 26 11:37:08 2018 +0800

    Merge remote-tracking branch 'origin/master'

 .../oap/server/core/register/EndpointInventory.java          |  2 +-
 .../oap/server/core/register/NetworkAddressInventory.java    |  2 +-
 .../oap/server/core/register/ServiceInstanceInventory.java   |  2 +-
 .../oap/server/core/register/ServiceInventory.java           |  2 +-
 .../skywalking/oap/server/core/source/DetectPoint.java       |  2 +-
 .../oap/server/receiver/trace/mock/AgentDataMock.java        | 12 ++++++------
 .../storage/plugin/elasticsearch/query/MetricQueryEsDAO.java |  2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)