This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch es/namespace in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 36a7bc2b5b65c1b426037720eef094cc302cdf66 Merge: 4843747 11ea4be Author: 吴晟 Wu Sheng <[email protected]> AuthorDate: Wed Mar 21 16:36:17 2018 +0800 Merge branch 'master' into es/namespace .travis.yml | 2 +- CHANGELOG.md => CHANGES.md | 4 +- LICENSE | 4 +- NOTICE | 10 +- .../META-INF.services/io.opentracing.Tracer | 18 ++ .../cluster/zookeeper/ClusterZKDataMonitor.java | 7 +- .../resources/META-INF/defines/test_define.define | 18 ++ .../storage/es/dao/ui/InstanceMetricEsUIDAO.java | 15 +- .../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 + .../skywalking/apm/agent/core/conf/Config.java | 5 + .../apm/agent/core/context/CarrierItem.java | 14 +- .../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 | 27 ++- docs/README.md | 1 + docs/cn/How-to-build-CN.md | 32 ++- docs/cn/Quick-start-CN.md | 2 +- docs/en/How-to-build.md | 20 +- docs/en/How-to-release.md | 238 +++++++++++++++++++-- docs/en/Quick-start.md | 2 +- licenses/LICENSE-data-set | 21 ++ pom.xml | 126 +++++++++-- skywalking-ui | 2 +- tools/releasing/create_source_release.sh | 51 +++++ 36 files changed, 846 insertions(+), 86 deletions(-) -- To stop receiving notification emails like this one, please contact [email protected].
