Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull leveldb subtree #15270

Merged
merged 2 commits into from Jan 30, 2019
Merged

Pull leveldb subtree #15270

merged 2 commits into from Jan 30, 2019

Conversation

@MarcoFalke
Copy link
Member

@MarcoFalke MarcoFalke commented Jan 26, 2019

Some windows-related fixes.

Sanity check with:

git fetch https://github.com/bitcoin-core/leveldb
./test/lint/git-subtree-check.sh src/leveldb
MarcoFalke added 2 commits Jan 26, 2019
f545dfa Merge #18: Use utf-8 to decode filename
f8e797a Use utf-8 to decode filename
2fc1148 Merge #14: Fixes to allow building with msvc.
d6eab93 Fixes to allow building with msvc.

git-subtree-dir: src/leveldb
git-subtree-split: f545dfa
@fanquake
Copy link
Member

@fanquake fanquake commented Jan 27, 2019

utACK fa61801

Pulls in Use utf-8 to decode filename and Fixes to allow building with msvc.

michael$ merge 15270
[pull/15270/local-merge ccaccc177] Merge #15270: Pull leveldb subtree
 Date: Sun Jan 27 10:25:17 2019 +0800
#15270 Pull leveldb subtree into master
* fa6180188 Pull leveldb subtree (MarcoFalke) (pull/15270/head)
* 4f2e6c8b8 Squashed 'src/leveldb/' changes from 524b7e36a8..f545dfabff (MarcoFalke)

Dropping you on a shell so you can try building/testing the merged source.
Run 'git diff HEAD~' to show the changes being merged.
Type 'exit' when done.
bash-3.2$ git fetch https://github.com/bitcoin-core/leveldb
remote: Enumerating objects: 547, done.
remote: Counting objects: 100% (547/547), done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 1284 (delta 544), reused 545 (delta 544), pack-reused 737
Receiving objects: 100% (1284/1284), 423.61 KiB | 930.00 KiB/s, done.
Resolving deltas: 100% (978/978), completed with 165 local objects.
From https://github.com/bitcoin-core/leveldb
 * branch                HEAD       -> FETCH_HEAD
bash-3.2$ ./test/lint/git-subtree-check.sh src/leveldb
src/leveldb in HEAD currently refers to tree 9a76136301c252c4b6a0ca628381af761f0fba4a
src/leveldb in HEAD was last updated in commit 4f2e6c8b881b7ccda36233332dfd1bd231389a8e (tree 9a76136301c252c4b6a0ca628381af761f0fba4a)
src/leveldb in HEAD was last updated to upstream commit f545dfabff4c2e9836efed094dba99a34fbc6b88 (tree 9a76136301c252c4b6a0ca628381af761f0fba4a)
GOOD

@DrahtBot
Copy link
Contributor

@DrahtBot DrahtBot commented Jan 27, 2019

Gitian builds for commit b78f6c6 (master):

Gitian builds for commit 66acf41 (master and this pull):

@ken2812221
Copy link
Contributor

@ken2812221 ken2812221 commented Jan 29, 2019

Tested the gitian build binaries. ACK fa61801

@MarcoFalke just notice that @DrahtBot website is down.

@MarcoFalke
Copy link
Member Author

@MarcoFalke MarcoFalke commented Jan 29, 2019

Ah, thx. I forgot to update the cloudflare settings. Should work now.

@MarcoFalke
Copy link
Member Author

@MarcoFalke MarcoFalke commented Jan 29, 2019

Tested ACK (didn't look at the code changes)

Current master:

screenshot from 2019-01-29 13-07-34

This pull:
screenshot from 2019-01-29 13-06-50

@laanwj
Copy link
Member

@laanwj laanwj commented Jan 30, 2019

utACK fa61801

@laanwj laanwj merged commit fa61801 into bitcoin:master Jan 30, 2019
2 checks passed
laanwj added a commit that referenced this issue Jan 30, 2019
4f2e6c8 Squashed 'src/leveldb/' changes from 524b7e3..f545dfa (MarcoFalke)

Pull request description:

  Some windows-related fixes.

  Sanity check with:

  ```
  git fetch https://github.com/bitcoin-core/leveldb
  ./test/lint/git-subtree-check.sh src/leveldb

Tree-SHA512: ff94907ff3075b81cffb733129673a9bfd2abbe84240686b29274382b64b4e5845880236458043d6db0332bf70d12942d9c0e68b4fffab43931103d224cb59d4
@MarcoFalke MarcoFalke deleted the Mf1901-subtreeLeveldb branch Jan 30, 2019
jasonbcox pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this issue Sep 13, 2019
Summary:
Some windows-related fixes.

Backport of Bitcoin Core PR15270
bitcoin/bitcoin#15270

Test Plan:
```
make check
```

Reviewers: Fabien, #bitcoin_abc, deadalnix, jasonbcox

Reviewed By: #bitcoin_abc, jasonbcox

Differential Revision: https://reviews.bitcoinabc.org/D4016
jonspock added a commit to jonspock/devault that referenced this issue Dec 22, 2019
Summary:
Some windows-related fixes.

Backport of Bitcoin Core PR15270
bitcoin/bitcoin#15270

Test Plan:
```
make check
```

Reviewers: Fabien, #bitcoin_abc, deadalnix, jasonbcox

Reviewed By: #bitcoin_abc, jasonbcox

Differential Revision: https://reviews.bitcoinabc.org/D4016
proteanx added a commit to devaultcrypto/devault that referenced this issue Dec 23, 2019
Summary:
Some windows-related fixes.

Backport of Bitcoin Core PR15270
bitcoin/bitcoin#15270

Test Plan:
```
make check
```

Reviewers: Fabien, #bitcoin_abc, deadalnix, jasonbcox

Reviewed By: #bitcoin_abc, jasonbcox

Differential Revision: https://reviews.bitcoinabc.org/D4016
PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this issue Mar 14, 2020
4f2e6c8 Squashed 'src/leveldb/' changes from 524b7e3..f545dfa (MarcoFalke)

Pull request description:

  Some windows-related fixes.

  Sanity check with:

  ```
  git fetch https://github.com/bitcoin-core/leveldb
  ./test/lint/git-subtree-check.sh src/leveldb

Tree-SHA512: ff94907ff3075b81cffb733129673a9bfd2abbe84240686b29274382b64b4e5845880236458043d6db0332bf70d12942d9c0e68b4fffab43931103d224cb59d4
PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this issue Mar 14, 2020
4f2e6c8 Squashed 'src/leveldb/' changes from 524b7e3..f545dfa (MarcoFalke)

Pull request description:

  Some windows-related fixes.

  Sanity check with:

  ```
  git fetch https://github.com/bitcoin-core/leveldb
  ./test/lint/git-subtree-check.sh src/leveldb

Tree-SHA512: ff94907ff3075b81cffb733129673a9bfd2abbe84240686b29274382b64b4e5845880236458043d6db0332bf70d12942d9c0e68b4fffab43931103d224cb59d4
barrystyle added a commit to PACGlobalOfficial/PAC that referenced this issue Mar 23, 2020
4f2e6c8 Squashed 'src/leveldb/' changes from 524b7e3..f545dfa (MarcoFalke)

Pull request description:

  Some windows-related fixes.

  Sanity check with:

  ```
  git fetch https://github.com/bitcoin-core/leveldb
  ./test/lint/git-subtree-check.sh src/leveldb

Tree-SHA512: ff94907ff3075b81cffb733129673a9bfd2abbe84240686b29274382b64b4e5845880236458043d6db0332bf70d12942d9c0e68b4fffab43931103d224cb59d4
zkbot added a commit to zcash/zcash that referenced this issue Sep 22, 2020
Update LevelDB to upstream commit f545dfabf

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#7911
- bitcoin/bitcoin#7982
- bitcoin/bitcoin#8133
- bitcoin/bitcoin#8784
  - Only the missing changes.
- bitcoin/bitcoin#8826
- bitcoin/bitcoin#8613
- bitcoin/bitcoin#10544
- bitcoin/bitcoin#10633
  - Only the changes to files and code we have.
- bitcoin/bitcoin#10806
- bitcoin/bitcoin#10958
- bitcoin/bitcoin#12451
- bitcoin/bitcoin#13925
- bitcoin/bitcoin#15270

This upgrades LevelDB in the exact same commit progression as upstream, up to January 2019.
zkbot added a commit to zcash/zcash that referenced this issue Sep 25, 2020
Update LevelDB to upstream commit f545dfabf

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#7911
- bitcoin/bitcoin#7982
- bitcoin/bitcoin#8133
- bitcoin/bitcoin#8784
  - Only the missing changes.
- bitcoin/bitcoin#8826
- bitcoin/bitcoin#8613
- bitcoin/bitcoin#10544
- bitcoin/bitcoin#10633
  - Only the changes to files and code we have.
- bitcoin/bitcoin#10806
- bitcoin/bitcoin#10958
- bitcoin/bitcoin#12451
- bitcoin/bitcoin#13925
- bitcoin/bitcoin#15270

This upgrades LevelDB in the exact same commit progression as upstream, up to January 2019.
ckti added a commit to ckti-ioncore-current/ion that referenced this issue Mar 28, 2021
4f2e6c8 Squashed 'src/leveldb/' changes from 524b7e3..f545dfa (MarcoFalke)

Pull request description:

  Some windows-related fixes.

  Sanity check with:

  ```
  git fetch https://github.com/bitcoin-core/leveldb
  ./test/lint/git-subtree-check.sh src/leveldb

Tree-SHA512: ff94907ff3075b81cffb733129673a9bfd2abbe84240686b29274382b64b4e5845880236458043d6db0332bf70d12942d9c0e68b4fffab43931103d224cb59d4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants