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

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

commit 585e59a12ecd8d5902dee01f673bcb156b30310b
Merge: 435adc6 8a3c9a0
Author: 吴晟 Wu Sheng <[email protected]>
AuthorDate: Sun Dec 17 09:39:48 2017 +0800

    Merge branch 'master' into wusheng/add-notice

 README.md                                                          | 7 ++++---
 README_ZH.md                                                       | 6 +++---
 apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml              | 2 +-
 apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml              | 2 +-
 apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml            | 2 +-
 apm-application-toolkit/apm-toolkit-opentracing/pom.xml            | 2 +-
 apm-application-toolkit/apm-toolkit-trace/pom.xml                  | 2 +-
 apm-application-toolkit/pom.xml                                    | 2 +-
 .../apm-collector-agent-grpc/collector-agent-grpc-define/pom.xml   | 2 +-
 .../apm-collector-agent-grpc/collector-agent-grpc-provider/pom.xml | 2 +-
 apm-collector/apm-collector-agent-grpc/pom.xml                     | 2 +-
 .../apm-collector-agent-jetty/collector-agent-jetty-define/pom.xml | 2 +-
 .../collector-agent-jetty-provider/pom.xml                         | 2 +-
 apm-collector/apm-collector-agent-jetty/pom.xml                    | 2 +-
 .../collector-agent-stream-define/pom.xml                          | 2 +-
 .../collector-agent-stream-provider/pom.xml                        | 2 +-
 apm-collector/apm-collector-agent-stream/pom.xml                   | 2 +-
 .../apm-collector-alerting/collector-alerting-define/pom.xml       | 2 +-
 .../apm-collector-alerting/collector-alerting-provider/pom.xml     | 2 +-
 apm-collector/apm-collector-alerting/pom.xml                       | 2 +-
 .../collector-baseline-computing-define/pom.xml                    | 2 +-
 .../collector-baseline-computing-provider/pom.xml                  | 2 +-
 .../collector-baseline-scheduler-define/pom.xml                    | 2 +-
 apm-collector/apm-collector-baseline/pom.xml                       | 2 +-
 apm-collector/apm-collector-boot/pom.xml                           | 2 +-
 apm-collector/apm-collector-cache/collector-cache-define/pom.xml   | 2 +-
 .../apm-collector-cache/collector-cache-guava-provider/pom.xml     | 2 +-
 apm-collector/apm-collector-cache/pom.xml                          | 2 +-
 .../apm-collector-cluster/collector-cluster-define/pom.xml         | 2 +-
 .../apm-collector-cluster/collector-cluster-redis-provider/pom.xml | 2 +-
 .../collector-cluster-standalone-provider/pom.xml                  | 2 +-
 .../collector-cluster-zookeeper-provider/pom.xml                   | 2 +-
 apm-collector/apm-collector-cluster/pom.xml                        | 2 +-
 apm-collector/apm-collector-component/client-component/pom.xml     | 2 +-
 apm-collector/apm-collector-component/pom.xml                      | 2 +-
 apm-collector/apm-collector-component/server-component/pom.xml     | 2 +-
 .../collector-configuration-define/pom.xml                         | 2 +-
 .../collector-configuration-provider/pom.xml                       | 2 +-
 apm-collector/apm-collector-configuration/pom.xml                  | 2 +-
 apm-collector/apm-collector-core/pom.xml                           | 2 +-
 .../collector-grpc-manager-define/pom.xml                          | 2 +-
 .../collector-grpc-manager-provider/pom.xml                        | 2 +-
 apm-collector/apm-collector-grpc-manager/pom.xml                   | 2 +-
 apm-collector/apm-collector-instrument/pom.xml                     | 2 +-
 .../collector-jetty-manager-define/pom.xml                         | 2 +-
 .../collector-jetty-manager-provider/pom.xml                       | 2 +-
 apm-collector/apm-collector-jetty-manager/pom.xml                  | 2 +-
 apm-collector/apm-collector-naming/collector-naming-define/pom.xml | 2 +-
 .../apm-collector-naming/collector-naming-jetty-provider/pom.xml   | 2 +-
 apm-collector/apm-collector-naming/pom.xml                         | 2 +-
 .../collector-queue-datacarrier-provider/pom.xml                   | 2 +-
 apm-collector/apm-collector-queue/collector-queue-define/pom.xml   | 2 +-
 .../apm-collector-queue/collector-queue-disruptor-provider/pom.xml | 2 +-
 apm-collector/apm-collector-queue/pom.xml                          | 2 +-
 apm-collector/apm-collector-remote/collector-remote-define/pom.xml | 2 +-
 .../apm-collector-remote/collector-remote-grpc-provider/pom.xml    | 2 +-
 .../apm-collector-remote/collector-remote-kafka-provider/pom.xml   | 2 +-
 apm-collector/apm-collector-remote/pom.xml                         | 2 +-
 .../apm-collector-storage/collector-storage-define/pom.xml         | 2 +-
 .../apm-collector-storage/collector-storage-es-provider/pom.xml    | 2 +-
 .../apm-collector-storage/collector-storage-h2-provider/pom.xml    | 2 +-
 apm-collector/apm-collector-storage/pom.xml                        | 2 +-
 apm-collector/apm-collector-stream/pom.xml                         | 2 +-
 apm-collector/apm-collector-ui/collector-ui-define/pom.xml         | 2 +-
 apm-collector/apm-collector-ui/collector-ui-jetty-provider/pom.xml | 2 +-
 apm-collector/apm-collector-ui/pom.xml                             | 2 +-
 apm-collector/pom.xml                                              | 2 +-
 apm-commons/apm-datacarrier/pom.xml                                | 2 +-
 apm-commons/apm-util/pom.xml                                       | 2 +-
 apm-commons/pom.xml                                                | 2 +-
 apm-network/pom.xml                                                | 2 +-
 apm-sniffer/apm-agent-core/pom.xml                                 | 2 +-
 apm-sniffer/apm-agent/pom.xml                                      | 2 +-
 apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml                    | 2 +-
 apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml          | 2 +-
 apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/pom.xml   | 2 +-
 apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml                 | 2 +-
 apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml                   | 2 +-
 apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml           | 2 +-
 apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml                    | 2 +-
 apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/pom.xml                | 2 +-
 .../apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/pom.xml    | 2 +-
 .../apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/pom.xml    | 2 +-
 apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml                    | 2 +-
 apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/pom.xml              | 2 +-
 apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/pom.xml              | 2 +-
 apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml                    | 2 +-
 apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml                | 2 +-
 apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/pom.xml    | 2 +-
 .../apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/pom.xml  | 2 +-
 apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml                    | 2 +-
 apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/pom.xml               | 2 +-
 apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/pom.xml              | 2 +-
 apm-sniffer/apm-sdk-plugin/pom.xml                                 | 2 +-
 apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/pom.xml           | 2 +-
 apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml                | 2 +-
 apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml                | 2 +-
 apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml             | 2 +-
 apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/pom.xml      | 2 +-
 .../spring-plugins/concurrent-util-4.x-plugin/pom.xml              | 2 +-
 apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/pom.xml       | 2 +-
 .../spring-plugins/mvc-annotation-3.x-plugin/pom.xml               | 2 +-
 .../spring-plugins/mvc-annotation-4.x-plugin/pom.xml               | 2 +-
 .../apm-sdk-plugin/spring-plugins/mvc-annotation-commons/pom.xml   | 2 +-
 apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml                  | 2 +-
 .../apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/pom.xml  | 2 +-
 .../spring-plugins/spring-cloud/netflix-plugins/pom.xml            | 2 +-
 .../netflix-plugins/spring-cloud-feign-1.x-plugin/pom.xml          | 2 +-
 apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/pom.xml     | 2 +-
 apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml         | 2 +-
 apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/pom.xml              | 2 +-
 apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml           | 2 +-
 apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml           | 2 +-
 apm-sniffer/apm-test-tools/pom.xml                                 | 2 +-
 .../apm-toolkit-log4j-1.x-activation/pom.xml                       | 2 +-
 .../apm-toolkit-log4j-2.x-activation/pom.xml                       | 2 +-
 .../apm-toolkit-logback-1.x-activation/pom.xml                     | 2 +-
 .../apm-toolkit-opentracing-activation/pom.xml                     | 2 +-
 .../apm-toolkit-activation/apm-toolkit-trace-activation/pom.xml    | 2 +-
 apm-sniffer/apm-toolkit-activation/pom.xml                         | 2 +-
 apm-sniffer/pom.xml                                                | 2 +-
 checkStyle.xml                                                     | 2 +-
 pom.xml                                                            | 3 +--
 123 files changed, 128 insertions(+), 128 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"[email protected]" <[email protected]>.

Reply via email to