Merged
Conversation
Member
Author
|
Includes some easy cherry-picks from theuni/trivial. @theuni Are you going to do the actual rebase? |
fa28e4c to
fa57495
Compare
Member
|
No translation changes, looks sane to me |
Member
|
May be nice to fix this one (from #6216) in the same go: petertodd@db6047d#commitcomment-14733536 |
* Fix order * Update subtree check
fa57495 to
fabd10a
Compare
Member
Author
|
Rebased and fixed nit |
laanwj
added a commit
that referenced
this pull request
Dec 2, 2015
fabd10a Fix typo in wallet.cpp (MarcoFalke) fad2460 Update contrib/devtools/README.md (MarcoFalke) 5e151a8 PartitionCheck: remove useless spaces (paveljanik) fad0088 TRIVIAL: Chainparams: Remove unused CBaseUnitTestParams (Jorge Timón) 74f7341 Update miner.cpp: Fix typo in comment (antonio-fr) e69bad1 [trivial] Fix typo in peertablemodel.cpp (MarcoFalke) 8a03727 Fix various typos (paveljanik)
luke-jr
pushed a commit
to luke-jr/bitcoin
that referenced
this pull request
Dec 8, 2015
Github-Pull: bitcoin#7157 Rebased-From: 8a03727
luke-jr
pushed a commit
to luke-jr/bitcoin
that referenced
this pull request
Dec 8, 2015
Github-Pull: bitcoin#7157 Rebased-From: e69bad1
luke-jr
pushed a commit
to luke-jr/bitcoin
that referenced
this pull request
Dec 8, 2015
Github-Pull: bitcoin#7157 Rebased-From: 74f7341
luke-jr
pushed a commit
to luke-jr/bitcoin
that referenced
this pull request
Dec 8, 2015
Github-Pull: bitcoin#7157 Rebased-From: 8a03727
luke-jr
pushed a commit
to luke-jr/bitcoin
that referenced
this pull request
Dec 8, 2015
Github-Pull: bitcoin#7157 Rebased-From: e69bad1
luke-jr
pushed a commit
to luke-jr/bitcoin
that referenced
this pull request
Dec 8, 2015
Github-Pull: bitcoin#7157 Rebased-From: 74f7341
maflcko
pushed a commit
that referenced
this pull request
Dec 6, 2018
…tes from upstream a67d713 [doc] developer-notes.md: point out that UniValue deviates from upstream (Sjors Provoost) Pull request description: While debugging an issue I was somewhat surprised to [learn](#14164 (comment)) that we've moved `src/univalue` from https://github.com/jgarzik/univalue to https://github.com/bitcoin-core/univalue, that these repos are both maintained and they're different. The first mention of using the bitcoin-core repo is from late 2015 in #7157. I didn't check when the last common ancestor commit is. I couldn't find documentation as to why (these things just happen in open source of course), but at minimum we should make this more clear. There's also the following line in `config.ac` that I'm not sure what to do with: ``` AC_INIT([univalue], [1.0.3], [http://github.com/jgarzik/univalue/]) ``` Tree-SHA512: e58105677b5ebe0005772282da4a805fee7dfccacfb1b2686a874517bf46072d1481181f8a8865d25526f6ed9e5fcd55d8d49906bf27cd0f5aefe4f258aa4d63
PastaPastaPasta
referenced
this pull request
in PastaPastaPasta/dash
Jul 1, 2021
…e deviates from upstream a67d713 [doc] developer-notes.md: point out that UniValue deviates from upstream (Sjors Provoost) Pull request description: While debugging an issue I was somewhat surprised to [learn](bitcoin#14164 (comment)) that we've moved `src/univalue` from https://github.com/jgarzik/univalue to https://github.com/bitcoin-core/univalue, that these repos are both maintained and they're different. The first mention of using the bitcoin-core repo is from late 2015 in dashpay#7157. I didn't check when the last common ancestor commit is. I couldn't find documentation as to why (these things just happen in open source of course), but at minimum we should make this more clear. There's also the following line in `config.ac` that I'm not sure what to do with: ``` AC_INIT([univalue], [1.0.3], [http://github.com/jgarzik/univalue/]) ``` Tree-SHA512: e58105677b5ebe0005772282da4a805fee7dfccacfb1b2686a874517bf46072d1481181f8a8865d25526f6ed9e5fcd55d8d49906bf27cd0f5aefe4f258aa4d63
UdjinM6
referenced
this pull request
in UdjinM6/dash
Jul 5, 2021
…e deviates from upstream a67d713 [doc] developer-notes.md: point out that UniValue deviates from upstream (Sjors Provoost) Pull request description: While debugging an issue I was somewhat surprised to [learn](bitcoin#14164 (comment)) that we've moved `src/univalue` from https://github.com/jgarzik/univalue to https://github.com/bitcoin-core/univalue, that these repos are both maintained and they're different. The first mention of using the bitcoin-core repo is from late 2015 in dashpay#7157. I didn't check when the last common ancestor commit is. I couldn't find documentation as to why (these things just happen in open source of course), but at minimum we should make this more clear. There's also the following line in `config.ac` that I'm not sure what to do with: ``` AC_INIT([univalue], [1.0.3], [http://github.com/jgarzik/univalue/]) ``` Tree-SHA512: e58105677b5ebe0005772282da4a805fee7dfccacfb1b2686a874517bf46072d1481181f8a8865d25526f6ed9e5fcd55d8d49906bf27cd0f5aefe4f258aa4d63
PastaPastaPasta
referenced
this pull request
in PastaPastaPasta/dash
Jul 8, 2021
…e deviates from upstream a67d713 [doc] developer-notes.md: point out that UniValue deviates from upstream (Sjors Provoost) Pull request description: While debugging an issue I was somewhat surprised to [learn](bitcoin#14164 (comment)) that we've moved `src/univalue` from https://github.com/jgarzik/univalue to https://github.com/bitcoin-core/univalue, that these repos are both maintained and they're different. The first mention of using the bitcoin-core repo is from late 2015 in dashpay#7157. I didn't check when the last common ancestor commit is. I couldn't find documentation as to why (these things just happen in open source of course), but at minimum we should make this more clear. There's also the following line in `config.ac` that I'm not sure what to do with: ``` AC_INIT([univalue], [1.0.3], [http://github.com/jgarzik/univalue/]) ``` Tree-SHA512: e58105677b5ebe0005772282da4a805fee7dfccacfb1b2686a874517bf46072d1481181f8a8865d25526f6ed9e5fcd55d8d49906bf27cd0f5aefe4f258aa4d63
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Should fix #7147 (comment)