Pull leveldb subtree #15270

pull MarcoFalke wants to merge 2 commits into bitcoin:master from MarcoFalke:Mf1901-subtreeLeveldb changing 3 files +22 −12
  1. MarcoFalke commented at 5:48 PM on January 26, 2019: member

    Some windows-related fixes.

    Sanity check with:

    git fetch https://github.com/bitcoin-core/leveldb
./test/lint/git-subtree-check.sh src/leveldb
  2. Squashed 'src/leveldb/' changes from 524b7e36a8..f545dfabff
    f545dfabff Merge #18: Use utf-8 to decode filename
f8e797a058 Use utf-8 to decode filename
2fc114812a Merge #14: Fixes to allow building with msvc.
d6eab93138 Fixes to allow building with msvc.

git-subtree-dir: src/leveldb
git-subtree-split: f545dfabff4c2e9836efed094dba99a34fbc6b88
    4f2e6c8b88
  3. Pull leveldb subtree fa6180188b
  4. MarcoFalke added the label Windows on Jan 26, 2019
  5. MarcoFalke added the label UTXO Db and Indexes on Jan 26, 2019
  6. MarcoFalke added the label Upstream on Jan 26, 2019
  7. MarcoFalke added this to the milestone 0.18.0 on Jan 26, 2019
  8. MarcoFalke added the label Needs gitian build on Jan 26, 2019
  9. fanquake commented at 2:40 AM on January 27, 2019: member

    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](/bitcoin-bitcoin/15270/): Pull leveldb subtree
 Date: Sun Jan 27 10:25:17 2019 +0800
[#15270](/bitcoin-bitcoin/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
  10. DrahtBot commented at 2:09 PM on January 27, 2019: member

    <!--a722867cd34abeea1fadc8d60700f111-->

    Gitian builds for commit b78f6c61c4527a40afa3263eb06c764ac786df5e (master):

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

  11. DrahtBot removed the label Needs gitian build on Jan 27, 2019
  12. ken2812221 commented at 8:35 AM on January 29, 2019: contributor

    Tested the gitian build binaries. ACK fa6180188b8ab89af97860e6497716405a48bab6 @MarcoFalke just notice that @DrahtBot website is down.

  13. MarcoFalke commented at 5:57 PM on January 29, 2019: member

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

  14. MarcoFalke commented at 6:12 PM on January 29, 2019: member

    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

  15. laanwj commented at 2:52 PM on January 30, 2019: member

    utACK fa6180188b8ab89af97860e6497716405a48bab6

  16. laanwj merged this on Jan 30, 2019
  17. laanwj closed this on Jan 30, 2019
  18. laanwj referenced this in commit 29396bd669 on Jan 30, 2019
  19. MarcoFalke deleted the branch on Jan 30, 2019
  20. jasonbcox referenced this in commit 29fec420b3 on Sep 13, 2019
  21. jonspock referenced this in commit b5e7634c7c on Dec 22, 2019
  22. proteanx referenced this in commit 4799c459a7 on Dec 23, 2019
  23. PastaPastaPasta referenced this in commit 88d92a569b on Mar 14, 2020
  24. PastaPastaPasta referenced this in commit 139108aba5 on Mar 14, 2020
  25. barrystyle referenced this in commit 35fca443cc on Mar 23, 2020
  26. zkbot referenced this in commit 59d6a92e7d on Sep 22, 2020
  27. zkbot referenced this in commit 514d868179 on Sep 25, 2020
  28. ckti referenced this in commit f1940576f6 on Mar 28, 2021
  29. DrahtBot locked this on Dec 16, 2021
Contributors
MarcoFalkefanquakeDrahtBotken2812221laanwj
Labels
WindowsUTXO Db and IndexesUpstream

Milestone
0.18.0

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2026-04-17 00:15 UTC
This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me