Skip to content

Bump leveldb subtree #12451

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Feb 22, 2018
Merged

Bump leveldb subtree #12451

merged 2 commits into from
Feb 22, 2018

Conversation

maflcko
Copy link
Member

@maflcko maflcko commented Feb 16, 2018 •
edited
Loading

Pull in changes from #11674 (comment).

Merges cleanly into master and 0.16 branch.

MarcoFalke added 2 commits February 16, 2018 08:59
Squashed 'src/leveldb/' changes from c521b3a..64052c7
835a21b 
64052c7 Merge #15: Add filename to corruption errors
135ed0f Add filename to corruption errors

git-subtree-dir: src/leveldb
git-subtree-split: 64052c7
Bump leveldb subtree
faa6dd2
@laanwj laanwj added this to the 0.16.1 milestone Feb 16, 2018
@fanquake
Copy link
Member

utACK faa6dd2

bash-3.2$ git fetch https://github.com/bitcoin-core/leveldb.git
remote: Counting objects: 1261, done.
remote: Total 1261 (delta 489), reused 489 (delta 489), pack-reused 771
Receiving objects: 100% (1261/1261), 427.53 KiB | 500.00 KiB/s, done.
Resolving deltas: 100% (962/962), completed with 156 local objects.
From https://github.com/bitcoin-core/leveldb
 * branch                HEAD       -> FETCH_HEAD
bash-3.2$ contrib/devtools/git-subtree-check.sh src/leveldb
src/leveldb in HEAD currently refers to tree d14102bd5802c9b2d4472f712a0a66653e41f5cc
src/leveldb in HEAD was last updated in commit 835a21b42402d546bd72f8a3f452f0c743fefe82 (tree d14102bd5802c9b2d4472f712a0a66653e41f5cc)
src/leveldb in HEAD was last updated to upstream commit 64052c76c567cff3dad32d1db0ef969d97b5882f (tree d14102bd5802c9b2d4472f712a0a66653e41f5cc)
GOOD

@laanwj
Copy link
Member

laanwj commented Feb 22, 2018

utACK faa6dd2

sebrandon1 pushed a commit to sebrandon1/bitcoin that referenced this pull request Feb 22, 2018
@laanwj
Merge bitcoin#12451: Bump leveldb subtree
aae64a2 
835a21b Squashed 'src/leveldb/' changes from c521b3a..64052c7 (MarcoFalke)

Pull request description:

  Pull in changes from bitcoin#11674 (comment).

  Merges cleanly into master and 0.16 branch.

Tree-SHA512: 819c042c0dfac8dc3078fc182c1e22d4a85b343967475d3389be5b5b056361114d8c9892437cd1dc4b45808c27880c0e166e047afc2c2bd2bbc33e55336a8c33
@laanwj laanwj merged commit faa6dd2 into bitcoin:master Feb 22, 2018
@maflcko maflcko deleted the Mf1802-leveldbSubtreeBump branch February 22, 2018 16:23
@maflcko maflcko restored the Mf1802-leveldbSubtreeBump branch February 23, 2018 17:32
@maflcko maflcko mentioned this pull request Feb 23, 2018
Merged
laanwj added a commit that referenced this pull request Mar 1, 2018
@laanwj
Merge #12518: [0.16] Bump leveldb subtree
a17fecf 
835a21b Squashed 'src/leveldb/' changes from c521b3a..64052c7 (MarcoFalke)

Pull request description:

  The leveldb bump is the same branch/commit as in #12451

Tree-SHA512: 585a55747c75e990c9fd73399e98e548c01bef8b960c0a99844326de43663d004d2211b4689518f2d3e51cc48a732e9c92082939c356793143db411224fa75fa
@maflcko maflcko deleted the Mf1802-leveldbSubtreeBump branch March 19, 2018 00:01
jasonbcox pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this pull request Sep 13, 2019
@fpelliccioni
Bump leveldb subtree
707568e 
Summary:
Pull in changes from bitcoin/bitcoin#11674 (comment).

Backport of Bitcoin Core PR12451
bitcoin/bitcoin#12451

Test Plan:
```
make check
```

Reviewers: Fabien, #bitcoin_abc, deadalnix, jasonbcox

Reviewed By: #bitcoin_abc, jasonbcox

Differential Revision: https://reviews.bitcoinabc.org/D4004
jonspock pushed a commit to jonspock/devault that referenced this pull request Dec 22, 2019
@jonspock
Bump leveldb subtree
86c9c9d 
Summary:
Pull in changes from bitcoin/bitcoin#11674 (comment).

Backport of Bitcoin Core PR12451
bitcoin/bitcoin#12451

Test Plan:
```
make check
```

Reviewers: Fabien, #bitcoin_abc, deadalnix, jasonbcox

Reviewed By: #bitcoin_abc, jasonbcox

Differential Revision: https://reviews.bitcoinabc.org/D4004
proteanx pushed a commit to devaultcrypto/devault that referenced this pull request Dec 23, 2019
@proteanx
Bump leveldb subtree
e4928f4 
Summary:
Pull in changes from bitcoin/bitcoin#11674 (comment).

Backport of Bitcoin Core PR12451
bitcoin/bitcoin#12451

Test Plan:
```
make check
```

Reviewers: Fabien, #bitcoin_abc, deadalnix, jasonbcox

Reviewed By: #bitcoin_abc, jasonbcox

Differential Revision: https://reviews.bitcoinabc.org/D4004
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Mar 14, 2020
@laanwj @PastaPastaPasta
Merge bitcoin#12518: [0.16] Bump leveldb subtree
80302de 
835a21b Squashed 'src/leveldb/' changes from c521b3a..64052c7 (MarcoFalke)

Pull request description:

  The leveldb bump is the same branch/commit as in bitcoin#12451

Tree-SHA512: 585a55747c75e990c9fd73399e98e548c01bef8b960c0a99844326de43663d004d2211b4689518f2d3e51cc48a732e9c92082939c356793143db411224fa75fa
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Mar 14, 2020
@laanwj @PastaPastaPasta
Merge bitcoin#12518: [0.16] Bump leveldb subtree
3f3101d 
835a21b Squashed 'src/leveldb/' changes from c521b3a..64052c7 (MarcoFalke)

Pull request description:

  The leveldb bump is the same branch/commit as in bitcoin#12451

Tree-SHA512: 585a55747c75e990c9fd73399e98e548c01bef8b960c0a99844326de43663d004d2211b4689518f2d3e51cc48a732e9c92082939c356793143db411224fa75fa
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Mar 19, 2020
@laanwj @PastaPastaPasta
Merge bitcoin#12518: [0.16] Bump leveldb subtree
c492640 
835a21b Squashed 'src/leveldb/' changes from c521b3a..64052c7 (MarcoFalke)

Pull request description:

  The leveldb bump is the same branch/commit as in bitcoin#12451

Tree-SHA512: 585a55747c75e990c9fd73399e98e548c01bef8b960c0a99844326de43663d004d2211b4689518f2d3e51cc48a732e9c92082939c356793143db411224fa75fa
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Mar 21, 2020
@laanwj @PastaPastaPasta
Merge bitcoin#12518: [0.16] Bump leveldb subtree
70ecd71 
835a21b Squashed 'src/leveldb/' changes from c521b3a..64052c7 (MarcoFalke)

Pull request description:

  The leveldb bump is the same branch/commit as in bitcoin#12451

Tree-SHA512: 585a55747c75e990c9fd73399e98e548c01bef8b960c0a99844326de43663d004d2211b4689518f2d3e51cc48a732e9c92082939c356793143db411224fa75fa
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Mar 24, 2020
@laanwj @PastaPastaPasta
Merge bitcoin#12518: [0.16] Bump leveldb subtree
d3e5f8e 
835a21b Squashed 'src/leveldb/' changes from c521b3a..64052c7 (MarcoFalke)

Pull request description:

  The leveldb bump is the same branch/commit as in bitcoin#12451

Tree-SHA512: 585a55747c75e990c9fd73399e98e548c01bef8b960c0a99844326de43663d004d2211b4689518f2d3e51cc48a732e9c92082939c356793143db411224fa75fa
@str4d str4d mentioned this pull request Sep 22, 2020
Merged
zkbot added a commit to zcash/zcash that referenced this pull request Sep 25, 2020
@zkbot
Auto merge of #4739 - str4d:update-leveldb, r=str4d
514d868 
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.
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
Upstream
Projects
None yet
Milestone
0.16.1
Development

Successfully merging this pull request may close these issues.
3 participants
@maflcko @fanquake @laanwj