Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

validator: expose max active pubsub subscriptions to CLI (backport #18034) #18035

Merged
merged 1 commit into from
Jun 18, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 17, 2021

This is an automatic backport of pull request #18034 done by Mergify.
Cherry-pick of 5efc48f has failed:

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

You are currently cherry-picking commit 5efc48fc6.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   core/src/rpc_pubsub.rs
	modified:   validator/src/main.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/src/rpc_pubsub_service.rs

To fix up this pull request, you can check it out 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 Jun 17, 2021
@t-nelson t-nelson force-pushed the mergify/bp/v1.6/pr-18034 branch from d37f6d8 to 72b7d14 Compare June 17, 2021 14:41
(cherry picked from commit 5efc48f)

# Conflicts:
#	core/src/rpc_pubsub_service.rs
@t-nelson t-nelson force-pushed the mergify/bp/v1.6/pr-18034 branch from 72b7d14 to 4080f32 Compare June 17, 2021 21:36
@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jun 17, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jun 17, 2021

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 18, 2021
@codecov
Copy link

codecov bot commented Jun 18, 2021

Codecov Report

Merging #18035 (4080f32) into v1.6 (1201ef1) will increase coverage by 0.0%.
The diff coverage is 100.0%.

@@           Coverage Diff           @@
##             v1.6   #18035   +/-   ##
=======================================
  Coverage    82.6%    82.6%           
=======================================
  Files         423      423           
  Lines      117091   117103   +12     
=======================================
+ Hits        96736    96748   +12     
  Misses      20355    20355           

@mergify mergify bot merged commit 0afb330 into v1.6 Jun 18, 2021
@mergify mergify bot deleted the mergify/bp/v1.6/pr-18034 branch June 18, 2021 00:36
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant