You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by pe...@apache.org on 2018/03/25 01:46:57 UTC
[incubator-skywalking] 03/03: Merge branch 'asf/5.0-alpha/release'
of https://github.com/apache/incubator-skywalking into
asf/5.0-alpha/release
This is an automated email from the ASF dual-hosted git repository.
pengys pushed a commit to branch asf/5.0-alpha/release
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit f640995ac49077fab853a7ad6a75c0a4f4213435
Merge: 7abe9d1 4e41ee0
Author: peng-yongsheng <80...@qq.com>
AuthorDate: Sun Mar 25 09:46:36 2018 +0800
Merge branch 'asf/5.0-alpha/release' of https://github.com/apache/incubator-skywalking into asf/5.0-alpha/release
.../src/main/resources/application.yml | 16 +++++++++++
.../src/main/resources/application-default.yml | 16 +++++++++++
.../src/main/proto/RemoteCommonService.proto | 18 ++++++++++++
apm-protocol/apm-network/src/main/proto | 2 +-
.../src/main/resources/ui-graphql/alarm.graphqls | 16 +++++++++++
.../ui-graphql/application-layer.graphqls | 16 +++++++++++
.../src/main/resources/ui-graphql/common.graphqls | 16 +++++++++++
.../src/main/resources/ui-graphql/config.graphqls | 16 +++++++++++
.../resources/ui-graphql/overview-layer.graphqls | 16 +++++++++++
.../resources/ui-graphql/server-layer.graphqls | 16 +++++++++++
.../resources/ui-graphql/service-layer.graphqls | 16 +++++++++++
.../src/main/resources/ui-graphql/trace.graphqls | 16 +++++++++++
.../apm/agent/core/plugin/PluginCfg.java | 2 +-
.../src/test/resources/config/agent.config | 16 +++++++++++
.../src/test/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
apm-sniffer/config/agent.config | 16 +++++++++++
.../src/main/resources/skywalking-plugin.def | 16 +++++++++++
apm-webapp/src/main/resources/application.yml | 16 +++++++++++
pom.xml | 32 ++++++++--------------
skywalking-ui | 2 +-
65 files changed, 993 insertions(+), 23 deletions(-)
--
To stop receiving notification emails like this one, please contact
pengys@apache.org.