From commits-return-4992-apmail-rocketmq-commits-archive=rocketmq.apache.org@rocketmq.apache.org Mon Jan 20 13:48:45 2020 Return-Path: X-Original-To: apmail-rocketmq-commits-archive@minotaur.apache.org Delivered-To: apmail-rocketmq-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by minotaur.apache.org (Postfix) with SMTP id 10C221914C for ; Mon, 20 Jan 2020 13:48:44 +0000 (UTC) Received: (qmail 21169 invoked by uid 500); 20 Jan 2020 13:48:44 -0000 Delivered-To: apmail-rocketmq-commits-archive@rocketmq.apache.org Received: (qmail 21143 invoked by uid 500); 20 Jan 2020 13:48:44 -0000 Mailing-List: contact commits-help@rocketmq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@rocketmq.apache.org Delivered-To: mailing list commits@rocketmq.apache.org Received: (qmail 21134 invoked by uid 99); 20 Jan 2020 13:48:44 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Jan 2020 13:48:44 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id F379B819D2; Mon, 20 Jan 2020 13:48:43 +0000 (UTC) Date: Mon, 20 Jan 2020 13:48:43 +0000 To: "commits@rocketmq.apache.org" Subject: [rocketmq] branch develop updated (ad76fd3 -> 881f767) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <157952812367.9048.7374102153204984120@gitbox.apache.org> From: jinrongtong@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: rocketmq X-Git-Refname: refs/heads/develop X-Git-Reftype: branch X-Git-Oldrev: ad76fd37a4eaa7f719f253ca78d7e97dae989404 X-Git-Newrev: 881f7675060bf889306adf695c65a02da057d8ff X-Git-NotificationType: ref_changed X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. jinrongtong pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/rocketmq.git. omit ad76fd3 Merge pull request #1683 from areyouok/pr_benchmark_consumer_2 omit b057f93 Merge pull request #1646 from liaozan/master omit 5f838f2 [maven-release-plugin] prepare for next development iteration omit 1716911 [maven-release-plugin] prepare release rocketmq-all-4.6.1 omit 68f050c feat(release):update version to release 4.6.1 omit 6be0922 optimise benchmark consumer, add consume fail rate option omit 46ad109 correct spelling This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/develop (881f767) \ O -- O -- O (ad76fd3) Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: acl/pom.xml | 2 +- broker/pom.xml | 2 +- client/pom.xml | 2 +- common/pom.xml | 2 +- .../java/org/apache/rocketmq/common/MQVersion.java | 2 +- distribution/pom.xml | 2 +- example/pom.xml | 6 ++-- .../rocketmq/example/benchmark/Consumer.java | 41 +++++----------------- filter/pom.xml | 2 +- logappender/pom.xml | 2 +- logging/pom.xml | 2 +- namesrv/pom.xml | 2 +- openmessaging/pom.xml | 2 +- pom.xml | 2 +- remoting/pom.xml | 2 +- srvutil/pom.xml | 2 +- store/pom.xml | 2 +- .../java/org/apache/rocketmq/store/CommitLog.java | 16 ++++----- test/pom.xml | 2 +- tools/pom.xml | 2 +- 20 files changed, 37 insertions(+), 60 deletions(-)