Backports for 0.12.0 (updated to e289807) #7338
Merged
Conversation
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
For opensource.org/licenses/MIT! Github-Pull: bitcoin#7197 Rebased-From: 00423e1
|
At least two of them got missed on purpose. |
…y reviewed. Github-Pull: bitcoin#7185 Rebased-From: e1030dd
Github-Pull: bitcoin#7068 Rebased-From: 979698c
Github-Pull: bitcoin#7213 Rebased-From: 37d271d
Github-Pull: bitcoin#7214 Rebased-From: fa2f4bc
Strings in a HTML context should be using formatHtmlWithUnit. Github-Pull: bitcoin#7255 Rebased-From: 5fdf32d
e8f2148 to
e20704b
Compare
| @@ -350,6 +350,20 @@ caching. A sample config for apache2 could look like: | |||
|
|
|||
| </VirtualHost> | |||
|
|
|||
| Asm script outputs now contain OP_CHECKLOCKTIMEVERIFY in place of OP_NOP2 | |||
There was a problem hiding this comment.
I'd suggest combining this with the other asm change related to signature flags, which is currently under "RPC: Low-level API changes".
|
utACK now that it contains no translation string changes anymore |
… changes" section
laanwj
added a commit
that referenced
this pull request
Jan 18, 2016
f17b00b release-notes: Combine NOP2->CLTV asm change into "RPC: Low-level API changes" section (Luke Dashjr) e20704b Replace some instances of formatWithUnit with formatHtmlWithUnit (fanquake) 6f8346d qt5: Use the fixed font the system recommends (MarcoFalke) 605de4a Rename OP_NOP2 to OP_CHECKLOCKTIMEVERIFY. (mb300sd) 6191a9b [RPC-Tests] add option to run rpc test over QT clients (Jonas Schnelli) 6307beb Note that reviewers should mention the commit hash of the commits they reviewed. (Patrick Strateman) 6092ff2 Set link from http:// to https:// (Suriyaa Kudo)
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.
Somehow these got missed