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

Cli configurable validators (backport #18630) #18666

Merged
merged 2 commits into from
Jul 16, 2021
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 14, 2021

This is an automatic backport of pull request #18630 done by Mergify.
Cherry-pick of a4a24b6 has failed:

On branch mergify/bp/v1.7/pr-18630
Your branch is ahead of 'origin/v1.7' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit a4a24b653.
  (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:   cli/Cargo.toml
	modified:   cli/src/cli.rs
	modified:   cli/src/cluster_query.rs
	modified:   cli/src/lib.rs

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

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/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 conflicts automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jul 14, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jul 14, 2021

automerge label removed due to a CI failure

@t-nelson t-nelson force-pushed the mergify/bp/v1.7/pr-18630 branch from 82cd860 to f6a774a Compare July 14, 2021 21:26
@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 Jul 14, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jul 14, 2021

automerge label removed due to a CI failure

@t-nelson
Copy link
Contributor

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Jul 16, 2021

Command rebase: success

Branch has been successfully rebased

@CriesofCarrots CriesofCarrots force-pushed the mergify/bp/v1.7/pr-18630 branch from f6a774a to ee55e15 Compare July 16, 2021 06:22
@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 Jul 16, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jul 16, 2021

automerge label removed due to a CI failure

@t-nelson
Copy link
Contributor

@Mergifyio rebase

t-nelson added 2 commits July 16, 2021 07:49
(cherry picked from commit a4a24b6)

# Conflicts:
#	Cargo.lock
@CriesofCarrots CriesofCarrots force-pushed the mergify/bp/v1.7/pr-18630 branch from ee55e15 to bf50cc7 Compare July 16, 2021 07:49
@mergify
Copy link
Contributor Author

mergify bot commented Jul 16, 2021

Command rebase: success

Branch has been successfully rebased

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jul 16, 2021
@mergify mergify bot merged commit 1570afe into v1.7 Jul 16, 2021
@codecov
Copy link

codecov bot commented Jul 16, 2021

Codecov Report

Merging #18666 (bf50cc7) into v1.7 (ef20559) will decrease coverage by 0.1%.
The diff coverage is 76.8%.

@@            Coverage Diff            @@
##             v1.7   #18666     +/-   ##
=========================================
- Coverage    82.5%    82.3%   -0.2%     
=========================================
  Files         428      432      +4     
  Lines      120239   121808   +1569     
=========================================
+ Hits        99199   100260   +1061     
- Misses      21040    21548    +508     

@mergify mergify bot deleted the mergify/bp/v1.7/pr-18630 branch July 16, 2021 09:49
@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