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

Merge leveldb subtree #13925

Merged
merged 2 commits into from Aug 10, 2018

Conversation

Projects
None yet
5 participants
@MarcoFalke
Copy link
Member

commented Aug 9, 2018

For review:

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

Closes #13860

MarcoFalke added some commits Aug 9, 2018

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
Merge leveldb subtree
Merge commit 'ec749b1bcdf2483b642fb51d635800e272c68ba6' into HEAD

@MarcoFalke MarcoFalke added this to the 0.17.0 milestone Aug 9, 2018

@achow101

This comment has been minimized.

Copy link
Member

commented Aug 9, 2018

utACK fa14fa7

@ken2812221

This comment has been minimized.

Copy link
Member

commented Aug 9, 2018

utACK fa14fa7

@fanquake

This comment has been minimized.

Copy link
Member

commented Aug 10, 2018

tested the subtree merge ACK fa14fa7

merge 13925
[pull/13925/local-merge 4fc2596df] Merge #13925: Merge leveldb subtree
 Date: Fri Aug 10 16:50:47 2018 +0800
#13925 Merge leveldb subtree into master
* fa14fa742 Merge leveldb subtree (MarcoFalke) (pull/13925/head)
* ec749b1bc Squashed 'src/leveldb/' changes from 64052c76c5..524b7e36a8 (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: Counting objects: 1266, done.
remote: Compressing objects: 100% (4/4), done.
remote: Total 1266 (delta 540), reused 541 (delta 540), pack-reused 722
Receiving objects: 100% (1266/1266), 415.15 KiB | 273.00 KiB/s, done.
Resolving deltas: 100% (963/963), completed with 160 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 f8cdc77167be86194f98d0412baf4b89d3d5abe6
src/leveldb in HEAD was last updated in commit ec749b1bcdf2483b642fb51d635800e272c68ba6 (tree f8cdc77167be86194f98d0412baf4b89d3d5abe6)
src/leveldb in HEAD was last updated to upstream commit 524b7e36a8e3bce6fcbcd1b5df09024283f325ba (tree f8cdc77167be86194f98d0412baf4b89d3d5abe6)
GOOD
bash-3.2$ 
@laanwj

This comment has been minimized.

Copy link
Member

commented Aug 10, 2018

utACK fa14fa7

@laanwj laanwj merged commit fa14fa7 into bitcoin:master Aug 10, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Aug 10, 2018

Merge #13925: Merge leveldb subtree
ec749b1 Squashed 'src/leveldb/' changes from 64052c76c5..524b7e36a8 (MarcoFalke)

Pull request description:

  For review:

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

  Closes #13860

Tree-SHA512: 9d13384fe35e7144b4a7fca57efe77b0cc5295952da4a397e4c6d8aa3f8043d5113fccedd3ae1dcaa3d2649e732e5f57a71504847946e055aa4dc8c3780e29fc

@MarcoFalke MarcoFalke deleted the MarcoFalke:Mf1808-leveldbSubtree branch Aug 10, 2018

@jnewbery jnewbery referenced this pull request Aug 20, 2018

Merged

Newsletters: add #9 (2018-08-21) #58

1 of 1 task complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.