Re: Next Steps

Git uses a lot of heuristics, particularly when recomputing and reapplying merges. In this case, there were a lot of cross merges between trunk and 3.0, cross merges between the two feature branches, and I think some incomplete merges. Basically, it just got into a really complicated state. On F

Re: Next Steps

I agree that committing to 2.x and merging to 3.x is the way to go based on previous experience with managing dual versions. Scott, I'll have a look at your 3.0 branch tonight. Again, excuse my ignorance of the darker bits of git, but do we know how the 3.0 branches ended up in this state? I would

[jira] [Resolved] (CURATOR-234) Add test logging back to modules

[ https://issues.apache.org/jira/browse/CURATOR-234?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Mike Drob resolved CURATOR-234. --- Resolution: Fixed Fix Version/s: 2.9.0 Jenkins is back to completing. > Add test logging back

Jenkins build is unstable: Curator #943

See

Jenkins build is unstable: Curator » Curator Recipes #943

See

[jira] [Commented] (CURATOR-234) Add test logging back to modules

[ https://issues.apache.org/jira/browse/CURATOR-234?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14697781#comment-14697781 ] Mike Drob commented on CURATOR-234: --- I pushed this, but the added logging made the Jenk

[jira] [Assigned] (CURATOR-234) Add test logging back to modules

[ https://issues.apache.org/jira/browse/CURATOR-234?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Mike Drob reassigned CURATOR-234: - Assignee: Mike Drob > Add test logging back to modules > > >

[jira] [Work started] (CURATOR-234) Add test logging back to modules

[ https://issues.apache.org/jira/browse/CURATOR-234?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Work on CURATOR-234 started by Mike Drob. - > Add test logging back to modules > > >

[jira] [Commented] (CURATOR-234) Add test logging back to modules

[ https://issues.apache.org/jira/browse/CURATOR-234?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14697607#comment-14697607 ] ASF GitHub Bot commented on CURATOR-234: Github user madrob closed the pull reque

[GitHub] curator pull request: CURATOR-234 Add slf4j-log4j12 test dependenc...

Github user madrob closed the pull request at: https://github.com/apache/curator/pull/90 --- 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 enab

Re: Next Steps

I think dual commits tend to be problematic. I'd suggest anything for 2.x goes into master and then we immediately merge master into 3.0. Anything for 3.0 stays in 3.0 only. (There will soon be a discussion to be had about whether master should become 3.0 in the near future.) More immediately,

Re: Next Steps

Once we have a stable 3.0 branch, should we dual-commit everything to master and 3.x? The ZK3.5 "alpha" labelling can scare off some adopters, so I think it is important to maintain 2.x for a little while longer. I can volunteer to do the next 2.x release once the tests are stabilized - I'll start

Re: Next Steps

Yes, the 3.0 branch I created should have everything. But let me emphasize I haven't pushed this to apache yet! I wanted you guys to check it out first, it's only pushed to my mirror. It's complicated to describe what I did. Mostly rebasing, some cherry picking, and fixing merge conflicts.