Commit 99bb368c authored by Kirill Smelkov's avatar Kirill Smelkov

ZEO4: Pick up patches needed by Wendelin.core 2

We need nexedi/ZEO@f2fae122 and nexedi/ZEO@7c104297

Those are small low-risk patches that are all backports of upstream ZEO
master. Upstream declared ZEO4 "dead" and does not want to apply any
patch to 4 branch, so we have to maintain them on our side.

The patches are required for wendelin.core 2 to work correctly because
without them ZEO does not provide full information about committed
objects on invalidation, and so WCFS will provide corrupt file data
because it will miss to know that some part of a file was changed.
parent bd79c641
...@@ -53,7 +53,10 @@ recipe = zc.recipe.egg:scripts ...@@ -53,7 +53,10 @@ recipe = zc.recipe.egg:scripts
eggs = ${ZEO:egg} eggs = ${ZEO:egg}
# ZEO4: we maintain our own 4-nxd branch with patches # ZEO4: we maintain our own 4-nxd branch with patches for wendelin.core to work
# correctly. The patches are backports of what is in ZEO master (ZEO5), but
# since upstream considers 4 branch to be "dead", we have to maintain it by ourselves.
# See https://github.com/zopefoundation/ZEO/pull/161 for the reference.
[ZEO4] [ZEO4]
recipe = zc.recipe.egg:develop recipe = zc.recipe.egg:develop
setup = ${ZEO4-repository:location} setup = ${ZEO4-repository:location}
...@@ -64,7 +67,7 @@ egg_versions = ...@@ -64,7 +67,7 @@ egg_versions =
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = https://lab.nexedi.com/nexedi/ZEO.git repository = https://lab.nexedi.com/nexedi/ZEO.git
branch = 4-nxd branch = 4-nxd
revision= 5114f909e5a5 revision= bf80d23d3506
location = ${buildout:parts-directory}/ZEO4 location = ${buildout:parts-directory}/ZEO4
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment