Skip to content

Conversation

@suhailsaqan
Copy link
Contributor

Fixes #24695 (Put undocumented JSON failure mode behind a runtime flag)

@maflcko
Copy link
Member

maflcko commented May 18, 2022

Copy link
Member

@luke-jr luke-jr left a comment

Choose a reason for hiding this comment

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

utACK after squashing

Copy link
Contributor

@w0xlt w0xlt left a comment

Choose a reason for hiding this comment

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

Approach ACK

@suhailsaqan
Copy link
Contributor Author

It says I can't squash because "A merge commit cannot exist among those commits". Would anyone know how to fix that?

@maflcko
Copy link
Member

maflcko commented May 18, 2022

See #25165

@suhailsaqan
Copy link
Contributor Author

When I do git merge master it says Already up to date.. Am I not following it correctly?

So the current situation I'm in is that the changes are committed on my master branch. So I did git checkout master and git fetch -all but then not sure if git merge master is the correct thing to do next?

Copy link

@vincenzopalazzo vincenzopalazzo left a comment

Choose a reason for hiding this comment

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

Concept ACK

@maflcko
Copy link
Member

maflcko commented May 18, 2022

I've reworked #25165 . Hopefully it should be clearer now?

rpc: Put undocumented JSON failure mode behind a runtime flag
Copy link
Member

@luke-jr luke-jr left a comment

Choose a reason for hiding this comment

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

utACK b953ea6

Copy link

@vincenzopalazzo vincenzopalazzo left a comment

Choose a reason for hiding this comment

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

ACK b953ea6

@maflcko maflcko merged commit bb83aba into bitcoin:master May 19, 2022
luke-jr pushed a commit to luke-jr/bitcoin that referenced this pull request May 21, 2022
rpc: Put undocumented JSON failure mode behind a runtime flag

Github-Pull: bitcoin#25161
Rebased-From: b953ea6
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request May 28, 2022
… runtime flag

b953ea6 rpc: Put undocumented JSON failure mode behind a runtime flag (Suhail Saqan)

Pull request description:

  Fixes bitcoin#24695 (Put undocumented JSON failure mode behind a runtime flag)

ACKs for top commit:
  luke-jr:
    utACK b953ea6
  vincenzopalazzo:
    ACK bitcoin@b953ea6

Tree-SHA512: 2005ee1b1f3b637918390b2ecd4166f2fd8c86e3c59fba3da8a0cbd5b1dffd03190c92f6dca3c489ecce4276eaf3108b2edcf9cd6224b713adb52f5bb848163b
@bitcoin bitcoin locked and limited conversation to collaborators May 19, 2023
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.

Put undocumented JSON failure mode behind a runtime flag

6 participants