[pulsar] branch branch-2.5 updated (fcd8902 -> 96b389e)

[zh...@apache.org]

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

zhaijia pushed a change to branch branch-2.5
in repository https://gitbox.apache.org/repos/asf/pulsar.git.


 discard fcd8902  fix version 2.5.0
 discard e166f75  Disable channel auto read when publish rate or publish buffer exceeded (#6550)
     new 96b389e  fix version 2.5.0

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (fcd8902)
            \
             N -- N -- N   refs/heads/branch-2.5 (96b389e)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

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:
 .../org/apache/pulsar/broker/service/AbstractTopic.java    |  6 ------
 .../org/apache/pulsar/broker/service/BrokerService.java    |  3 ---
 .../java/org/apache/pulsar/broker/service/ServerCnx.java   | 14 ++++----------
 3 files changed, 4 insertions(+), 19 deletions(-)

[pulsar] 01/01: fix version 2.5.0

[zh...@apache.org]

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

zhaijia pushed a commit to branch branch-2.5
in repository https://gitbox.apache.org/repos/asf/pulsar.git

commit 96b389ed10fd66eaa1bf7e640fb3a531090084ca
Author: Jia Zhai <zh...@apache.org>
AuthorDate: Fri Mar 20 21:32:45 2020 +0800

    fix version 2.5.0
---
 protobuf-shaded/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/protobuf-shaded/pom.xml b/protobuf-shaded/pom.xml
index d694ef1..94cbe62 100644
--- a/protobuf-shaded/pom.xml
+++ b/protobuf-shaded/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.pulsar</groupId>
     <artifactId>pulsar</artifactId>
-    <version>2.6.0-SNAPSHOT</version>
+    <version>2.5.0</version>
     <relativePath>..</relativePath>
   </parent>