You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/03/21 08:36:18 UTC
[incubator-skywalking] branch es/namespace updated (4843747 ->
36a7bc2)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch es/namespace
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from 4843747 Finish all codes about ES namespace feature.
add e9147a6 remove repotoken (#957)
add dcd6a71 Asf/5.0 alpha/release (#959)
add 8362486 Use secure connection to npmjs.org (#958)
add ae39e7b Merge release documents (#960)
add c56046d Add namespace for headers. (#954)
add b1265df Update How-to-release.md (#961)
add afcd331 Fix zk path error. (#963)
add e4aa8ea Update How-to-release.md (#964)
add 4589f4e Fix an invalid doc. (#965)
add b5de1a1 Update How-to-release.md (#966)
add 8106c38 add npm install error tips. (#970)
add 11ea4be fix #939 (#969)
new 36a7bc2 Merge branch 'master' into es/namespace
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:
.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-omit.js.txt => LICENSE-data-set} | 2 +-
pom.xml | 126 +++++++++--
skywalking-ui | 2 +-
tools/releasing/create_source_release.sh | 51 +++++
36 files changed, 826 insertions(+), 87 deletions(-)
rename CHANGELOG.md => CHANGES.md (97%)
create mode 100644 apm-dist/release-docs/README.txt
copy licenses/{LICENSE-omit.js.txt => LICENSE-data-set} (97%)
create mode 100755 tools/releasing/create_source_release.sh
--
To stop receiving notification emails like this one, please contact
wusheng@apache.org.
[incubator-skywalking] 01/01: Merge branch 'master' into
es/namespace
Posted by wu...@apache.org.
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 <wu...@foxmail.com>
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
wusheng@apache.org.