From edffdf6ce44977473ad267ec54c37a1de807da59 Mon Sep 17 00:00:00 2001 From: wu-sheng Date: Fri, 23 Feb 2018 08:47:53 +0800 Subject: [PATCH 1/2] Add links to resources catalog in https://github.com/OpenSkywalking/Community --- docs/README.md | 4 ++++ docs/README_ZH.md | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/docs/README.md b/docs/README.md index 8928e771a..ab0683ffa 100644 --- a/docs/README.md +++ b/docs/README.md @@ -22,6 +22,10 @@ * [Plugin development guide](en/Plugin-Development-Guide.md) * Protocol * [Cross Process Propagation Headers Protocol, v1.0](en/Skywalking-Cross-Process-Propagation-Headers-Protocol-v1.md) + * Resources provided by community + * [Public speakings](https://github.com/OpenSkywalking/Community#public-speakings) + * [Videos](https://github.com/OpenSkywalking/Community#videos) + * [Articles](https://github.com/OpenSkywalking/Community#articles) * FAQ * [Why only traces in UI?](cn/FAQ/Why-have-traces-no-others.md) * [Too many GRPC logs in the console](cn/FAQ/Too-many-gRPC-logs.md) diff --git a/docs/README_ZH.md b/docs/README_ZH.md index 2cf5f1658..db6bbb2db 100644 --- a/docs/README_ZH.md +++ b/docs/README_ZH.md @@ -25,6 +25,10 @@ * 交互协议 * [Cross Process Propagation Headers Protocol, v1.0 跨进程追踪上下文传递协议](cn/Skywalking-Cross-Process-Propagation-Headers-Protocol-CN-v1.md) * [SkyWalking Trace Data Protocol 探针与Collector间网络协议](cn/Trace-Data-Protocol-CN.md) + * 社区提供的共享资源 + * [公开演讲](https://github.com/OpenSkywalking/Community#public-speakings) + * [视频](https://github.com/OpenSkywalking/Community#videos) + * [文章](https://github.com/OpenSkywalking/Community#articles) * FAQ * [Trace查询有数据，但是没有拓扑图和JVM数据?](cn/FAQ/Why-have-traces-no-others-CN.md) * [加载探针，Console被GRPC日志刷屏](cn/FAQ/Too-many-gRPC-logs-CN.md) From 8a1f4434d7e690400e6fe40cc4f14aa42561a053 Mon Sep 17 00:00:00 2001 From: wu-sheng Date: Fri, 23 Feb 2018 16:51:14 +0800 Subject: [PATCH 2/2] Update submodule. --- apm-protocol/apm-network/src/main/proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apm-protocol/apm-network/src/main/proto b/apm-protocol/apm-network/src/main/proto index 86bfe4f66..04e6ecad2 160000 --- a/apm-protocol/apm-network/src/main/proto +++ b/apm-protocol/apm-network/src/main/proto @@ -1 +1 @@ -Subproject commit 86bfe4f6635a8f71abca2383f54565b621ed3f94 +Subproject commit 04e6ecad27f19ee09068e1fdf9a42012dece0f30