Github user eolivelli commented on the issue: https://github.com/apache/zookeeper/pull/580 @jtuple in my opinion it is better to allow all of changes coming from Facebook to be merged in as soon as possible. Having only one common codebase is necessary in order to work together. So from my point of view it will be better to mark cleearly all of the changes coming from FB fork, this way reviewers and committer will take it in account and treat the patch under that light. Last year for instance in Bookkeeper we merged three 'diverged' forks from Yahoo, Twitter and Salesforce into the Apache codebase. It has been a long work but now it is super easy to collaborate. Once we have a common codebase refactoring will be easier for everyone. Just my 2cents
---