GitHub user sijie opened a pull request:
https://github.com/apache/bookkeeper/pull/187
CompactionTest tests are broken because of BOOKKEEPER-1088
Problem:
5fe86525a9c823f79b3e97fd82ea4aa1c75c79eb this commit broken the master. It
is because the merge/rebase introduce duplicated lines
Solution:
This change is to remove the duplicated lines introduced at
5fe86525a9c823f79b3e97fd82ea4aa1c75c79eb
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/sijie/bookkeeper sijie/fix_merge_issue
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/bookkeeper/pull/187.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #187
----
commit 45d2c539abd64f7d5ef98b94acc61e651c41a45b
Author: Sijie Guo <si...@apache.org>
Date: 2017-06-10T03:52:39Z
Remove duplicated lines introduced when merging pull requests
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
