Also, can we get this in the 3.5 branch as well? On Thu, Mar 16, 2017 at 11:03 AM, Camille Fournier <[email protected]> wrote:
> I'm trying to follow the instructions on the wiki to approve changes: > https://cwiki.apache.org/confluence/display/ZOOKEEPER/ > Merging+Github+Pull+Requests > > but it does not appear to work. Specifically, this merge script: > python zk-merge-pr.py > > is erroring out with: > > File "/Library/Python/2.7/site-packages/pbr-2.0.0-py2.7.egg/pbr/version.py", > line 25, in <module> > > import pkg_resources > > File "build/bdist.macosx-10.12-intel/egg/pkg_resources/__init__.py", > line 72, in <module> > > File "build/bdist.macosx-10.12-intel/egg/packaging/requirements.py", > line 59, in <module> > > TypeError: __call__() takes exactly 2 arguments (1 given) > > > Any ideas? > > > C >
