Update to 6.29.4 plus 752fea5d4400198bc8a591b7d795d1c8d5f12230 #12

Open

moodyjon wants to merge 2 commits from moodyjon/master into master

moodyjon commented

2022-08-02 00:12:55 +02:00

(Migrated from github.com)

Experimental... I don't know whether there are missing changes local to lbryio/lbry-rocksdb here, as I constructed this by doing:

git checkout origin/6.29.fb
git cherry-pick 752fea5d4400198bc8a591b7d795d1c8d5f12230

The latter is the zlib bump from Mar 2022.

Underlying goal is to fix the clang build issue by updating to a version that contains: https://github.com/facebook/rocksdb/pull/9374

Experimental... I don't know whether there are missing changes local to lbryio/lbry-rocksdb here, as I constructed this by doing: git checkout origin/6.29.fb git cherry-pick 752fea5d4400198bc8a591b7d795d1c8d5f12230 The latter is the zlib bump from Mar 2022. Underlying goal is to fix the clang build issue by updating to a version that contains: https://github.com/facebook/rocksdb/pull/9374

jackrobison (Migrated from github.com) reviewed 2022-08-02 00:12:55 +02:00

This pull request can be merged automatically.

You are not authorized to merge this pull request.

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin moodyjon/master:moodyjon/master

git checkout moodyjon/master

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout master

git merge --no-ff moodyjon/master

git checkout moodyjon/master

git rebase master

git checkout master

git merge --ff-only moodyjon/master

git checkout moodyjon/master

git rebase master

git checkout master

git merge --no-ff moodyjon/master

git checkout master

git merge --squash moodyjon/master