You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by zh...@apache.org on 2018/01/13 09:31:48 UTC
[incubator-skywalking] branch master updated (cbcb592 -> 225e6bb)
This is an automated email from the ASF dual-hosted git repository.
zhangxin pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from cbcb592 Merge pull request #738 from YunaiV/master-5.0
add 79cddf6 Changed boolean type to integer, true: 1, false: 0.
new 225e6bb Merge pull request #750 from peng-yongsheng/fixed/es_storage_bug
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:
.../analysis/jvm/provider/service/MemoryMetricService.java | 3 ++-
.../provider/register/ApplicationRegisterSerialWorker.java | 3 ++-
.../register/provider/register/InstanceRegisterSerialWorker.java | 3 ++-
.../analysis/register/provider/service/ApplicationIDService.java | 9 +++------
.../analysis/register/provider/service/InstanceIDService.java | 5 +++--
.../apm-collector-boot/src/main/resources/application.yml | 8 ++++----
.../skywalking/apm/collector/storage/table/jvm/MemoryMetric.java | 9 ++++-----
.../apm/collector/storage/table/register/Application.java | 9 ++++-----
.../apm/collector/storage/table/register/Instance.java | 9 ++++-----
.../apm/collector/storage/es/dao/cache/InstanceEsCacheDAO.java | 4 ----
.../collector/storage/es/dao/cache/NetworkAddressEsCacheDAO.java | 2 +-
.../es/dao/memorymp/AbstractMemoryMetricEsPersistenceDAO.java | 2 +-
.../h2/dao/memorymp/AbstractMemoryMetricH2PersistenceDAO.java | 4 ++--
13 files changed, 32 insertions(+), 38 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@skywalking.apache.org" <co...@skywalking.apache.org>'].
[incubator-skywalking] 01/01: Merge pull request #750 from
peng-yongsheng/fixed/es_storage_bug
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhangxin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 225e6bb9fc96dc14ed218b762d9a9a88bdaa2e38
Merge: cbcb592 79cddf6
Author: Xin,Zhang <zh...@apache.org>
AuthorDate: Sat Jan 13 17:31:45 2018 +0800
Merge pull request #750 from peng-yongsheng/fixed/es_storage_bug
Changed boolean type to integer, true: 1, false: 0.
.../analysis/jvm/provider/service/MemoryMetricService.java | 3 ++-
.../provider/register/ApplicationRegisterSerialWorker.java | 3 ++-
.../register/provider/register/InstanceRegisterSerialWorker.java | 3 ++-
.../analysis/register/provider/service/ApplicationIDService.java | 9 +++------
.../analysis/register/provider/service/InstanceIDService.java | 5 +++--
.../apm-collector-boot/src/main/resources/application.yml | 8 ++++----
.../skywalking/apm/collector/storage/table/jvm/MemoryMetric.java | 9 ++++-----
.../apm/collector/storage/table/register/Application.java | 9 ++++-----
.../apm/collector/storage/table/register/Instance.java | 9 ++++-----
.../apm/collector/storage/es/dao/cache/InstanceEsCacheDAO.java | 4 ----
.../collector/storage/es/dao/cache/NetworkAddressEsCacheDAO.java | 2 +-
.../es/dao/memorymp/AbstractMemoryMetricEsPersistenceDAO.java | 2 +-
.../h2/dao/memorymp/AbstractMemoryMetricH2PersistenceDAO.java | 4 ++--
13 files changed, 32 insertions(+), 38 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@skywalking.apache.org" <co...@skywalking.apache.org>.