Github user saleem-akbar commented on the issue:
https://github.com/apache/commons-collections/pull/35
Hi,
#34 was for an older branch (apache:COLLECTIONS_3_2_X) .. as weâre still
using that branch, ideally Iâd like that version built - however Iâm not
entirely sure if the CI for that branch is working properly?
#35 is for the latest branch (apache:master) â however I believe one of
your colleagues took my PR and modified the JUnit test case to use Java 7
idioms and merged it in to master, so I would imagine #35 is now redundant and
can be closed:
https://issues.apache.org/jira/browse/COLLECTIONS-599?focusedCommentId=16349105&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-16349105
Cheers
Saleem
From: Bruno P. Kinoshita [mailto:[email protected]]
Sent: 21 July 2018 12:32
To: apache/commons-collections <[email protected]>
Cc: Saleem Akbar <[email protected]>; Mention <[email protected]>
Subject: Re: [apache/commons-collections] COLLECTION-599: Fix for
out-of-memory errors during session replication (#35)
@saleem-akbar<https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_saleem-2Dakbar&d=DwMFaQ&c=U-xfQUIl-0G8P2IcZBeK3A&r=aN13ZqLqJy0VWmEAUd6JvHTnZJvOdZPmzjpMBFIvMhE&m=6R3oD8BWoO5piwInS0MdycLD23EhhrsIvsP7WqsecxU&s=pgwUe3ZTXvYPZtAZb9Z-7bvQR40qG1Mr9gwsf2SOZ8g&e=>,
thanks for taking your time to prepare a pull request.
Looks like, actually, there are two pull requests from you, for the same
issue.
#34<https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_apache_commons-2Dcollections_pull_34&d=DwMFaQ&c=U-xfQUIl-0G8P2IcZBeK3A&r=aN13ZqLqJy0VWmEAUd6JvHTnZJvOdZPmzjpMBFIvMhE&m=6R3oD8BWoO5piwInS0MdycLD23EhhrsIvsP7WqsecxU&s=rjsR0tBEaJGO95P5Tj2ixqj7Bwuvg67BC_okCCMCVo4&e=>
and
#35<https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_apache_commons-2Dcollections_pull_35&d=DwMFaQ&c=U-xfQUIl-0G8P2IcZBeK3A&r=aN13ZqLqJy0VWmEAUd6JvHTnZJvOdZPmzjpMBFIvMhE&m=6R3oD8BWoO5piwInS0MdycLD23EhhrsIvsP7WqsecxU&s=2BFlDzCWGxlPpt2gvgL1DEd9zeV37Xe7w9PL3hgeWzA&e=>.
This one has conflicting files, and cannot be easily merged.
#34<https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_apache_commons-2Dcollections_pull_34&d=DwMFaQ&c=U-xfQUIl-0G8P2IcZBeK3A&r=aN13ZqLqJy0VWmEAUd6JvHTnZJvOdZPmzjpMBFIvMhE&m=6R3oD8BWoO5piwInS0MdycLD23EhhrsIvsP7WqsecxU&s=rjsR0tBEaJGO95P5Tj2ixqj7Bwuvg67BC_okCCMCVo4&e=>
is not passing the CI server build.
Could you clarify which of these two pull requests should be used for
COLLECTION-599, please? Also, if you could rebase/fix whichever is the good
one, please. That'd make review&merging your changes must easier (and faster).
Thank you!
Bruno
â
You are receiving this because you were mentioned.
Reply to this email directly, view it on
GitHub<https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_apache_commons-2Dcollections_pull_35-23issuecomment-2D406789472&d=DwMFaQ&c=U-xfQUIl-0G8P2IcZBeK3A&r=aN13ZqLqJy0VWmEAUd6JvHTnZJvOdZPmzjpMBFIvMhE&m=6R3oD8BWoO5piwInS0MdycLD23EhhrsIvsP7WqsecxU&s=TOIZhxMQbQNSKF9gTYJP2Gm0hmlhk6GykmSMZGZPQ_4&e=>,
or mute the
thread<https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_notifications_unsubscribe-2Dauth_AFHcjvyS0Zo-5Fr3Gbt2g15t-2DCz8taoZ20ks5uIxEkgaJpZM4R2ArT&d=DwMFaQ&c=U-xfQUIl-0G8P2IcZBeK3A&r=aN13ZqLqJy0VWmEAUd6JvHTnZJvOdZPmzjpMBFIvMhE&m=6R3oD8BWoO5piwInS0MdycLD23EhhrsIvsP7WqsecxU&s=aG8wCRvCoN9mjikJgcP3gR14Wo7rPuDTPX4a8CKwPVg&e=>.
The information in this e-mail and any attachments is confidential and may
be legally privileged. It is intended solely for the addressee or addressees.
Any use or disclosure of the contents of this e-mail/attachments by a not
intended recipient is unauthorized and may be unlawful. If you have received
this e-mail in error please notify the sender. Please note that any views or
opinions presented in this e-mail are solely those of the author and do not
necessarily represent those of TEMENOS. We recommend that you check this e-mail
and any attachments against viruses. TEMENOS accepts no liability for any
damage caused by any malicious code or virus transmitted by this e-mail.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]