You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by do...@apache.org on 2017/05/27 06:10:34 UTC

[7/8] incubator-rocketmq git commit: Merge remote-tracking branch 'wip/ROCKETMQ-206' into develop

Merge remote-tracking branch 'wip/ROCKETMQ-206' into develop


Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/e57f9ac4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/e57f9ac4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/e57f9ac4

Branch: refs/heads/develop
Commit: e57f9ac433bdf4ec640089ccaf580954e93f50dc
Parents: 04c8925 aced0de
Author: dongeforever <zh...@yeah.net>
Authored: Sat May 27 12:39:25 2017 +0800
Committer: dongeforever <zh...@yeah.net>
Committed: Sat May 27 12:39:25 2017 +0800

----------------------------------------------------------------------
 .../client/consumer/store/LocalFileOffsetStore.java   | 14 ++++++++++++--
 .../apache/rocketmq/example/benchmark/Consumer.java   |  3 ++-
 .../org/apache/rocketmq/example/filter/Consumer.java  |  3 ++-
 .../rocketmq/namesrv/kvconfig/KVConfigManager.java    |  7 ++++++-
 4 files changed, 22 insertions(+), 5 deletions(-)
----------------------------------------------------------------------