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:50 UTC
[incubator-skywalking] 01/01: Merge branch 'master' into
fix/graphql/node-nullable
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>.