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

Cli: enable json output (bp #9478) #9495

Merged
merged 1 commit into from
Apr 14, 2020
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 14, 2020

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

Cherry-pick of 5298e38 has failed:

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

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

Changes to be committed:

	modified:   cli/src/cli.rs
	new file:   cli/src/cli_output.rs
	modified:   cli/src/cluster_query.rs
	modified:   cli/src/display.rs
	modified:   cli/src/main.rs
	modified:   cli/src/nonce.rs
	modified:   cli/src/validator_info.rs
	modified:   cli/src/vote.rs

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

	both modified:   Cargo.lock
	both modified:   cli/Cargo.toml
	both modified:   cli/src/lib.rs
	both modified:   cli/src/stake.rs

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
  • @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 simulator.

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

@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Apr 14, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Apr 14, 2020
@CriesofCarrots
Copy link
Contributor

CriesofCarrots commented Apr 14, 2020

@mvines , any objection to me including this deletion as part of fixing these conflicts?
#9455

@mvines
Copy link
Member

mvines commented Apr 14, 2020

@mvines , any objection to me including this deletion as part of fixing these conflicts?
#9455

not at all

automerge

(cherry picked from commit 5298e38)
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Apr 14, 2020
@codecov
Copy link

codecov bot commented Apr 14, 2020

Codecov Report

Merging #9495 into v1.1 will decrease coverage by 0.4%.
The diff coverage is 0.3%.

@@           Coverage Diff           @@
##            v1.1   #9495     +/-   ##
=======================================
- Coverage   81.3%   80.8%   -0.5%     
=======================================
  Files        276     277      +1     
  Lines      62332   62667    +335     
=======================================
- Hits       50682   50672     -10     
- Misses     11650   11995    +345     

@solana-grimes solana-grimes merged commit d7c43f0 into v1.1 Apr 14, 2020
@mergify mergify bot deleted the mergify/bp/v1.1/pr-9478 branch April 14, 2020 21:22
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 conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants