Skip to content
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.

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

RPC: Don't send base64 TXs to old clusters (bp #13047) #13062

Merged
merged 1 commit into from
Oct 21, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 21, 2020

This is an automated backport of pull request #13047 done by Mergify

Cherry-pick of 86a9821 has failed:

On branch mergify/bp/v1.3/pr-13047
Your branch is up to date with 'origin/v1.3'.

You are currently cherry-picking commit 86a982150.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   client/src/mock_sender.rs
	modified:   client/src/rpc_client.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   Cargo.lock
	both modified:   client/Cargo.toml

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

@mergify mergify bot added the conflicts label Oct 21, 2020
@t-nelson t-nelson force-pushed the mergify/bp/v1.3/pr-13047 branch from 601ad69 to e64ad8d Compare October 21, 2020 17:08
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Oct 21, 2020
@CriesofCarrots
Copy link
Contributor

@t-nelson , I think you might have pushed to the wrong branch here!

@t-nelson t-nelson removed the automerge Merge this Pull Request automatically once CI passes label Oct 21, 2020
@t-nelson t-nelson force-pushed the mergify/bp/v1.3/pr-13047 branch from e64ad8d to 20094e2 Compare October 21, 2020 17:59
@t-nelson t-nelson added the automerge Merge this Pull Request automatically once CI passes label Oct 21, 2020
@mergify
Copy link
Contributor Author

mergify bot commented Oct 21, 2020

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Oct 21, 2020
@CriesofCarrots CriesofCarrots force-pushed the mergify/bp/v1.3/pr-13047 branch from 20094e2 to 808a3f4 Compare October 21, 2020 19:52
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Oct 21, 2020
@codecov
Copy link

codecov bot commented Oct 21, 2020

Codecov Report

Merging #13062 into v1.3 will increase coverage by 0.0%.
The diff coverage is 75.7%.

@@          Coverage Diff           @@
##            v1.3   #13062   +/-   ##
======================================
  Coverage   82.0%    82.0%           
======================================
  Files        362      362           
  Lines      84475    84507   +32     
======================================
+ Hits       69337    69372   +35     
+ Misses     15138    15135    -3     

@mergify mergify bot merged commit 15a49d7 into v1.3 Oct 21, 2020
@mergify mergify bot deleted the mergify/bp/v1.3/pr-13047 branch October 21, 2020 21:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this Pull Request automatically once CI passes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants