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/05 14:56:01 UTC
[incubator-skywalking] branch master updated (c9bb341 -> beda526)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from c9bb341 Merge pull request #883 from peng-yongsheng/fixed/855
add 395ad44 The instance heart beat implementation of http JSON protocol.
add 845f553 Merge branch 'master' into feature/http_json
new beda526 Merge pull request #884 from peng-yongsheng/feature/http_json
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:
.../agent-jetty/agent-jetty-provider/pom.xml | 10 +++++++
...r.java => InstanceHeartBeatServletHandler.java} | 35 +++++++++-------------
.../define/service/IInstanceIDService.java | 2 --
.../provider/service/InstanceIDService.java | 25 ----------------
4 files changed, 24 insertions(+), 48 deletions(-)
copy apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/{InstanceDiscoveryServletHandler.java => InstanceHeartBeatServletHandler.java} (58%)
--
To stop receiving notification emails like this one, please contact
wusheng@apache.org.
[incubator-skywalking] 01/01: Merge pull request #884 from
peng-yongsheng/feature/http_json
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit beda52614090e35a77d521aee25e45609bcaea40
Merge: c9bb341 845f553
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Mon Mar 5 22:55:58 2018 +0800
Merge pull request #884 from peng-yongsheng/feature/http_json
The instance heart beat implementation of http JSON protocol.
.../agent-jetty/agent-jetty-provider/pom.xml | 10 +++
.../handler/InstanceHeartBeatServletHandler.java | 72 ++++++++++++++++++++++
.../define/service/IInstanceIDService.java | 2 -
.../provider/service/InstanceIDService.java | 25 --------
4 files changed, 82 insertions(+), 27 deletions(-)
--
To stop receiving notification emails like this one, please contact
wusheng@apache.org.