Merge leveldb subtree #13925

pull MarcoFalke wants to merge 2 commits into bitcoin:master from MarcoFalke:Mf1808-leveldbSubtree changing 1 files +2 −2
  1. MarcoFalke commented at 3:33 pm on August 9, 2018: member

    For review:

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

    Closes #13860

  2. Squashed 'src/leveldb/' changes from 64052c76c5..524b7e36a8
    524b7e36a8 Merge #19: Increase maximum read-only mmap()s used from 1000 to 4096 on 64-bit systems
    4874cb8d3e Increase maximum number of read-only mmap()s used from 1000 to 4096 on 64 bit systems.
    
    git-subtree-dir: src/leveldb
    git-subtree-split: 524b7e36a8e3bce6fcbcd1b5df09024283f325ba
    ec749b1bcd
  3. Merge leveldb subtree
    Merge commit 'ec749b1bcdf2483b642fb51d635800e272c68ba6' into HEAD
    fa14fa742d
  4. MarcoFalke added this to the milestone 0.17.0 on Aug 9, 2018
  5. achow101 commented at 9:26 pm on August 9, 2018: member
    utACK fa14fa742d3347c5b627f3375770536c648192fe
  6. ken2812221 commented at 9:55 pm on August 9, 2018: contributor
    utACK fa14fa7
  7. fanquake added the label Upstream on Aug 10, 2018
  8. fanquake commented at 8:54 am on August 10, 2018: member

    tested the subtree merge ACK fa14fa7

     0merge 13925
     1[pull/13925/local-merge 4fc2596df] Merge [#13925](/bitcoin-bitcoin/13925/): Merge leveldb subtree
     2 Date: Fri Aug 10 16:50:47 2018 +0800
     3[#13925](/bitcoin-bitcoin/13925/) Merge leveldb subtree into master
     4* fa14fa742 Merge leveldb subtree (MarcoFalke) (pull/13925/head)
     5* ec749b1bc Squashed 'src/leveldb/' changes from 64052c76c5..524b7e36a8 (MarcoFalke)
     6
     7Dropping you on a shell so you can try building/testing the merged source.
     8Run 'git diff HEAD~' to show the changes being merged.
     9Type 'exit' when done.
    10
    11bash-3.2$ git fetch https://github.com/bitcoin-core/leveldb
    12remote: Counting objects: 1266, done.
    13remote: Compressing objects: 100% (4/4), done.
    14remote: Total 1266 (delta 540), reused 541 (delta 540), pack-reused 722
    15Receiving objects: 100% (1266/1266), 415.15 KiB | 273.00 KiB/s, done.
    16Resolving deltas: 100% (963/963), completed with 160 local objects.
    17From https://github.com/bitcoin-core/leveldb
    18 * branch                HEAD       -> FETCH_HEAD
    19
    20bash-3.2$ ./test/lint/git-subtree-check.sh src/leveldb
    21src/leveldb in HEAD currently refers to tree f8cdc77167be86194f98d0412baf4b89d3d5abe6
    22src/leveldb in HEAD was last updated in commit ec749b1bcdf2483b642fb51d635800e272c68ba6 (tree f8cdc77167be86194f98d0412baf4b89d3d5abe6)
    23src/leveldb in HEAD was last updated to upstream commit 524b7e36a8e3bce6fcbcd1b5df09024283f325ba (tree f8cdc77167be86194f98d0412baf4b89d3d5abe6)
    24GOOD
    25bash-3.2$ 
    
  9. laanwj commented at 5:47 pm on August 10, 2018: member
    utACK fa14fa742d3347c5b627f3375770536c648192fe
  10. laanwj merged this on Aug 10, 2018
  11. laanwj closed this on Aug 10, 2018

  12. laanwj referenced this in commit 71dec5c81f on Aug 10, 2018
  13. MarcoFalke deleted the branch on Aug 10, 2018
  14. jasonbcox referenced this in commit 85bc68c460 on Sep 13, 2019
  15. jonspock referenced this in commit 2f44940486 on Dec 22, 2019
  16. proteanx referenced this in commit f3d8ba754b on Dec 23, 2019
  17. zkbot referenced this in commit 59d6a92e7d on Sep 22, 2020
  18. zkbot referenced this in commit 514d868179 on Sep 25, 2020
  19. PastaPastaPasta referenced this in commit 6142e0c324 on Feb 2, 2021
  20. PastaPastaPasta referenced this in commit 02c02aa191 on Feb 3, 2021
  21. PastaPastaPasta referenced this in commit 2f301fdb09 on Feb 4, 2021
  22. MarcoFalke locked this on Sep 8, 2021

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: 2024-12-04 06:12 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me