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/01/15 02:51:49 UTC
[incubator-skywalking] branch fix/graphql/node-nullable updated
(691fb78 -> 315a6f0)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch fix/graphql/node-nullable
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from 691fb78 Add `isAlarm` for ApplicationNode.
add df67393 Merge branch 'master' of https://github.com/apache/incubator-skywalking into master-5.0
add 8854921 fixes #735 Concurrency conflicts in Spring plugin
add 647f4f0 fixes #735 Concurrency conflicts in Spring plugin ：clear ThreadLocal
add 44a5526 fixes #735 Concurrency conflicts in Spring plugin
add b954a0b Merge branch 'master' into master-5.0
add 9453c8c Merge branch 'master' into master-5.0
add b5c4863 Merge branch 'master' into master-5.0
add cbcb592 Merge pull request #738 from YunaiV/master-5.0
add 79cddf6 Changed boolean type to integer, true: 1, false: 0.
add 225e6bb Merge pull request #750 from peng-yongsheng/fixed/es_storage_bug
add fc431d3 Missing change about boolean to integer.
add 6ce5bfd Make ci works with resin and ojdbc again. Try to build.
add 973718d Adjust dir path.
add 7b50554 Fix wrong url.
add 79579ba Use maven repository resin 3 dependencies.
add 4a01c08 Remove an install.
add 3cd03a7 Add Chinese document about building resin and ojdbc plugins.
add fdf4a6e Fix typo.
add 5da5d05 Rmove a download.
add 33616bc Merge branch 'master' into ci-from-cache
add 657b1a2 Merge pull request #747 from apache/ci-from-cache
add 18a83ce Update NOTICE.txt
add d937cfa Merge pull request #751 from apache/update-year
add bd32554 Merge branch 'master' into fixed/storage_bug
add b04b06a Fixed the id auto increment bug, when there is just one record that id = -1, the expected value is 1, but actual return -1.
add adceb77 Merge branch 'master' into fixed/id_increment_bug
add fa9f7e4 Merge pull request #754 from peng-yongsheng/fixed/id_increment_bug
add 05efadc Merge branch 'master' into fixed/storage_bug
add b8d66bd Merge pull request #755 from peng-yongsheng/fixed/storage_bug
add c5bedc5 New badges about github stars and twitter followers.
add 7a8afc5 Change layout.
add bcffa44 Update badges.
add 3f59c05 Merge pull request #756 from apache/document/star-twitter
new 315a6f0 Merge branch 'master' into fix/graphql/node-nullable
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 | 11 ++++---
NOTICE.txt | 2 +-
README.md | 4 ++-
README_ZH.md | 4 ++-
.../jvm/provider/service/MemoryMetricService.java | 3 +-
.../worker/segment/SegmentCostSpanListener.java | 3 +-
.../register/ApplicationRegisterSerialWorker.java | 3 +-
.../provider/register/IdAutoIncrement.java | 18 +++++-----
.../register/InstanceRegisterSerialWorker.java | 3 +-
.../provider/service/ApplicationIDService.java | 9 ++---
.../provider/service/InstanceIDService.java | 5 +--
.../register/IdAutoIncrementTestCase.java} | 38 ++++++++++++----------
.../src/main/resources/application.yml | 8 ++---
.../collector/storage/table/jvm/MemoryMetric.java | 9 +++--
.../storage/table/register/Application.java | 9 +++--
.../collector/storage/table/register/Instance.java | 9 +++--
.../storage/table/segment/SegmentCost.java | 9 +++--
.../storage/es/dao/cache/InstanceEsCacheDAO.java | 4 ---
.../es/dao/cache/NetworkAddressEsCacheDAO.java | 2 +-
.../AbstractMemoryMetricEsPersistenceDAO.java | 2 +-
.../AbstractMemoryMetricH2PersistenceDAO.java | 4 +--
.../mvc/commons/EnhanceRequireObjectCache.java | 21 +++++++-----
...eceptor.java => AbstractMethodInterceptor.java} | 35 +++++++++++---------
.../InvokeHandlerMethodInterceptor.java | 6 ++--
.../RequestMappingMethodInterceptor.java | 5 +--
.../interceptor/RestMappingMethodInterceptor.java | 9 ++---
docs/README_ZH.md | 2 +-
docs/cn/How-to-build-CN.md | 8 +++++
pom.xml | 32 +-----------------
29 files changed, 133 insertions(+), 144 deletions(-)
copy apm-collector/apm-collector-analysis/analysis-register/register-provider/src/{main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/IdAutoIncrement.java => test/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/IdAutoIncrementTestCase.java} (60%)
rename apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/{AbstractMethodInteceptor.java => AbstractMethodInterceptor.java} (85%)
--
To stop receiving notification emails like this one, please contact
['"commits@skywalking.apache.org" <co...@skywalking.apache.org>'].
[incubator-skywalking] 01/01: Merge branch 'master' into
fix/graphql/node-nullable
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch fix/graphql/node-nullable
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 315a6f06d97611eed29ccaac48abf979776ca849
Merge: 691fb78 3f59c05
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Mon Jan 15 10:51:46 2018 +0800
Merge branch 'master' into fix/graphql/node-nullable
.travis.yml | 11 ++++---
NOTICE.txt | 2 +-
README.md | 4 ++-
README_ZH.md | 4 ++-
.../jvm/provider/service/MemoryMetricService.java | 3 +-
.../worker/segment/SegmentCostSpanListener.java | 3 +-
.../register/ApplicationRegisterSerialWorker.java | 3 +-
.../provider/register/IdAutoIncrement.java | 18 +++++-----
.../register/InstanceRegisterSerialWorker.java | 3 +-
.../provider/service/ApplicationIDService.java | 9 ++---
.../provider/service/InstanceIDService.java | 5 +--
.../register/IdAutoIncrementTestCase.java} | 38 ++++++++++++----------
.../src/main/resources/application.yml | 8 ++---
.../collector/storage/table/jvm/MemoryMetric.java | 9 +++--
.../storage/table/register/Application.java | 9 +++--
.../collector/storage/table/register/Instance.java | 9 +++--
.../storage/table/segment/SegmentCost.java | 9 +++--
.../storage/es/dao/cache/InstanceEsCacheDAO.java | 4 ---
.../es/dao/cache/NetworkAddressEsCacheDAO.java | 2 +-
.../AbstractMemoryMetricEsPersistenceDAO.java | 2 +-
.../AbstractMemoryMetricH2PersistenceDAO.java | 4 +--
.../mvc/commons/EnhanceRequireObjectCache.java | 21 +++++++-----
...eceptor.java => AbstractMethodInterceptor.java} | 35 +++++++++++---------
.../InvokeHandlerMethodInterceptor.java | 6 ++--
.../RequestMappingMethodInterceptor.java | 5 +--
.../interceptor/RestMappingMethodInterceptor.java | 9 ++---
docs/README_ZH.md | 2 +-
docs/cn/How-to-build-CN.md | 8 +++++
pom.xml | 32 +-----------------
29 files changed, 133 insertions(+), 144 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@skywalking.apache.org" <co...@skywalking.apache.org>.