This is an automated email from the ASF dual-hosted git repository. zhangxin pushed a commit to branch sw3_namespace in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 66055a9acae28a50ec2315343c9be7694e803307 Merge: 95c7714 8362486 Author: Xin,Zhang <[email protected]> AuthorDate: Mon Mar 19 10:32:18 2018 +0800 Merge branch 'master' into sw3_namespace .travis.yml | 2 +- CHANGELOG.md => CHANGES.md | 4 +- LICENSE | 4 +- NOTICE | 10 +- .../META-INF.services/io.opentracing.Tracer | 18 +++ .../resources/META-INF/defines/test_define.define | 18 +++ .../main/resources/META-INF/defines/storage.define | 18 +++ .../main/resources/META-INF/defines/storage.define | 18 +++ apm-dist/bin/collectorService.bat | 16 ++ apm-dist/bin/collectorService.sh | 16 ++ apm-dist/bin/startup.bat | 16 ++ apm-dist/bin/startup.sh | 16 ++ apm-dist/bin/webappService.bat | 16 ++ apm-dist/bin/webappService.sh | 16 ++ apm-dist/pom.xml | 34 +++- apm-dist/release-docs/README.txt | 49 ++++++ apm-dist/src/main/assembly/binary.xml | 7 + .../apm-sdk-plugin/hystrix-1.x-plugin/pom.xml | 26 ++- .../apm-sdk-plugin/servicecomb-plugin/pom.xml | 22 ++- .../servicecomb-java-chassis-0.x-plugin/pom.xml | 25 ++- .../servicecomb-java-chassis-1.x-plugin/pom.xml | 18 +++ apm-webapp/pom.xml | 28 +++- docs/README.md | 1 + docs/cn/How-to-build-CN.md | 18 ++- docs/cn/Quick-start-CN.md | 2 +- docs/en/How-to-build.md | 18 ++- docs/en/How-to-release.md | 174 +++++++++++++++++++-- docs/en/Quick-start.md | 2 +- licenses/LICENSE-data-set | 21 +++ pom.xml | 126 +++++++++++++-- skywalking-ui | 2 +- tools/releasing/create_source_release.sh | 51 ++++++ 32 files changed, 739 insertions(+), 73 deletions(-) -- To stop receiving notification emails like this one, please contact [email protected].
