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 2017/12/22 13:49:04 UTC

[incubator-skywalking] 01/01: Merge branch 'master' into fix/log-file-bug

This is an automated email from the ASF dual-hosted git repository.

zhangxin pushed a commit to branch fix/log-file-bug
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git

commit 59371b1ff5c973cc732e3b213b0a225106150b05
Merge: 375abe9 3cf0a59
Author: Xin,Zhang <zh...@apache.org>
AuthorDate: Fri Dec 22 21:49:00 2017 +0800

    Merge branch 'master' into fix/log-file-bug

 .../commons/datacarrier/BlockingDataCarrier.java   | 37 ++++++++++++++
 .../apm/commons/datacarrier/DataCarrier.java       | 59 +++++++++++++++-------
 .../apm/commons/datacarrier/buffer/Buffer.java     | 16 +++++-
 .../apm/commons/datacarrier/buffer/Channels.java   | 15 +++---
 .../callback/QueueBlockingCallback.java            | 28 ++++++++++
 .../commons/datacarrier/consumer/ConsumerPool.java | 13 ++---
 .../datacarrier/consumer/ConsumerThread.java       |  6 ++-
 .../datacarrier/consumer/ConsumerPoolTest.java     |  4 +-
 8 files changed, 140 insertions(+), 38 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@skywalking.apache.org" <co...@skywalking.apache.org>.