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

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


The following commit(s) were added to refs/heads/6.0 by this push:
     new b0b7de9  Fix CI. And add a new instance ping service.
b0b7de9 is described below

commit b0b7de944209c8637fe233d78cc55bdc24f83d5e
Author: Wu Sheng <[email protected]>
AuthorDate: Thu Aug 16 16:30:03 2018 +0800

    Fix CI. And add a new instance ping service.
---
 apm-protocol/apm-network/src/main/proto               |  2 +-
 ...kywalking.oap.server.library.module.ModuleProvider | 19 -------------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/apm-protocol/apm-network/src/main/proto 
b/apm-protocol/apm-network/src/main/proto
index c9fa240..e259efb 160000
--- a/apm-protocol/apm-network/src/main/proto
+++ b/apm-protocol/apm-network/src/main/proto
@@ -1 +1 @@
-Subproject commit c9fa240a6784d6edb944f77e23a7366b35146263
+Subproject commit e259efbc20a69e23a5c8542394579f006396e6a5
diff --git 
a/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
 
b/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
index 784e0a7..714dcb7 100644
--- 
a/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
+++ 
b/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
@@ -16,23 +16,4 @@
 #
 #
 
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-
-
 
org.apache.skywalking.oap.server.receiver.istio.telemetry.provider.IstioTelemetryReceiverProvider
\ No newline at end of file

Reply via email to