Skip to content

Conversation

mzumsande
Copy link
Contributor

This fixes a silent conflict between #28123 (which removed all \"options\") and #27460 (which added a new one).

It should fix the current CI failures.

@DrahtBot
Copy link
Contributor

DrahtBot commented Aug 17, 2023

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK jonatack, ajtowns, MarcoFalke, hebasto

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

Copy link
Member

@jonatack jonatack left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 2394314

With this change, ./test/functional/test_runner.py --jobs=11 --timeout-factor=0 --coverage no longer warns as it does on current master

Uncovered RPC commands:
  - Internal

and .oneline_description in this RPC is set to a value similar to that in the other RPCs.

@ajtowns
Copy link
Contributor

ajtowns commented Aug 18, 2023

utACK 2394314

@maflcko
Copy link
Member

maflcko commented Aug 18, 2023

lgtm ACK 2394314

@maflcko maflcko added this to the 26.0 milestone Aug 18, 2023
@maflcko maflcko added the Bug label Aug 18, 2023
Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 2394314

@fanquake fanquake merged commit e4a855c into bitcoin:master Aug 18, 2023
Frank-GER pushed a commit to syscoin/syscoin that referenced this pull request Sep 8, 2023
…ne description

2394314 rpc: remove one more quote from non-string oneline description (Martin Zumsande)

Pull request description:

  This fixes a silent conflict between bitcoin#28123 (which removed all `\"options\"`) and bitcoin#27460 (which added a new one).

  It should fix the current CI failures.

ACKs for top commit:
  ajtowns:
    utACK 2394314
  MarcoFalke:
    lgtm ACK 2394314
  jonatack:
    ACK 2394314
  hebasto:
    ACK 2394314

Tree-SHA512: feb0c2b936a77be45d9c65aa7d738277b2266b5153665fee3b1413045de521195dc7d5efa2fc8b37b22f16e9b8d0ee8de25bfd151a428666122b31f64056557a
@bitcoin bitcoin locked and limited conversation to collaborators Aug 17, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants