You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by zh...@apache.org on 2017/12/25 03:54:35 UTC
[incubator-skywalking] branch master updated (121cabb -> 5e40b8e)
This is an automated email from the ASF dual-hosted git repository.
zhangxin pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from 121cabb Merge pull request #702 from ascrutae/feature/okhttpclient-async
add 6e152b4 Move `apm-network` module under the new root module `apm-protocol`. And add `apm-ui-query` under the `apm-protocol` module.
new 5e40b8e Merge pull request #703 from apache/5.0-alpha/ui-query-protocol
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../skywalking/apm/commons/datacarrier/DataCarrierTest.java | 2 +-
{apm-network => apm-protocol/apm-network}/pom.xml | 2 +-
.../skywalking/apm/network/trace/component/Component.java | 0
.../apm/network/trace/component/ComponentsDefine.java | 0
.../apm/network/trace/component/OfficialComponent.java | 0
.../src/main/proto/ApplicationRegisterService.proto | 0
.../apm-network}/src/main/proto/DiscoveryService.proto | 0
.../apm-network}/src/main/proto/Downstream.proto | 0
.../apm-network}/src/main/proto/JVMMetricsService.proto | 0
.../apm-network}/src/main/proto/KeyWithIntegerValue.proto | 0
.../apm-network}/src/main/proto/KeyWithStringValue.proto | 0
.../apm-network}/src/main/proto/TraceSegmentService.proto | 0
.../skywalking/apm/network/trace/proto/GRPCNoServerTest.java | 0
.../apm-datacarrier => apm-protocol/apm-ui-query}/pom.xml | 7 ++++---
.../pom.xml | 12 ++++++++----
pom.xml | 2 +-
16 files changed, 15 insertions(+), 10 deletions(-)
rename {apm-network => apm-protocol/apm-network}/pom.xml (99%)
rename {apm-network => apm-protocol/apm-network}/src/main/java/org/apache/skywalking/apm/network/trace/component/Component.java (100%)
rename {apm-network => apm-protocol/apm-network}/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java (100%)
rename {apm-network => apm-protocol/apm-network}/src/main/java/org/apache/skywalking/apm/network/trace/component/OfficialComponent.java (100%)
rename {apm-network => apm-protocol/apm-network}/src/main/proto/ApplicationRegisterService.proto (100%)
rename {apm-network => apm-protocol/apm-network}/src/main/proto/DiscoveryService.proto (100%)
rename {apm-network => apm-protocol/apm-network}/src/main/proto/Downstream.proto (100%)
rename {apm-network => apm-protocol/apm-network}/src/main/proto/JVMMetricsService.proto (100%)
rename {apm-network => apm-protocol/apm-network}/src/main/proto/KeyWithIntegerValue.proto (100%)
rename {apm-network => apm-protocol/apm-network}/src/main/proto/KeyWithStringValue.proto (100%)
rename {apm-network => apm-protocol/apm-network}/src/main/proto/TraceSegmentService.proto (100%)
rename {apm-network => apm-protocol/apm-network}/src/test/java/org/apache/skywalking/apm/network/trace/proto/GRPCNoServerTest.java (100%)
copy {apm-commons/apm-datacarrier => apm-protocol/apm-ui-query}/pom.xml (92%)
copy {apm-collector/apm-collector-baseline/collector-baseline-computing-define => apm-protocol}/pom.xml (84%)
--
To stop receiving notification emails like this one, please contact
['"commits@skywalking.apache.org" <co...@skywalking.apache.org>'].
[incubator-skywalking] 01/01: Merge pull request #703 from
apache/5.0-alpha/ui-query-protocol
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhangxin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 5e40b8e3fbf7e4142796efb694f810325dc85d4c
Merge: 121cabb 6e152b4
Author: Xin,Zhang <zh...@apache.org>
AuthorDate: Mon Dec 25 11:54:33 2017 +0800
Merge pull request #703 from apache/5.0-alpha/ui-query-protocol
Prepare for ui-query GraphQL protocol
.../apm/commons/datacarrier/DataCarrierTest.java | 2 +-
{apm-network => apm-protocol/apm-network}/pom.xml | 2 +-
.../apm/network/trace/component/Component.java | 0
.../network/trace/component/ComponentsDefine.java | 0
.../network/trace/component/OfficialComponent.java | 0
.../main/proto/ApplicationRegisterService.proto | 0
.../src/main/proto/DiscoveryService.proto | 0
.../apm-network}/src/main/proto/Downstream.proto | 0
.../src/main/proto/JVMMetricsService.proto | 0
.../src/main/proto/KeyWithIntegerValue.proto | 0
.../src/main/proto/KeyWithStringValue.proto | 0
.../src/main/proto/TraceSegmentService.proto | 0
.../apm/network/trace/proto/GRPCNoServerTest.java | 0
apm-protocol/apm-ui-query/pom.xml | 33 +++++++++++++++++++
apm-protocol/pom.xml | 37 ++++++++++++++++++++++
pom.xml | 2 +-
16 files changed, 73 insertions(+), 3 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@skywalking.apache.org" <co...@skywalking.apache.org>.