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

Passing -v/--verbose to solana confirm now displays the full transaction (bp #9520) #9530

Merged
merged 1 commit into from
Apr 16, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 16, 2020

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

Cherry-pick of 7e7cbec has failed:

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

You are currently cherry-picking commit 7e7cbec8a.
  (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
	modified:   cli/src/display.rs
	modified:   client/src/rpc_client.rs
	modified:   client/src/rpc_request.rs
	modified:   ledger-tool/src/main.rs
	modified:   transaction-status/src/lib.rs

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

	both modified:   Cargo.lock
	both modified:   cli/Cargo.toml
	both modified:   ledger-tool/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
  • @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 the conflicts label Apr 16, 2020
@mvines mvines force-pushed the mergify/bp/v1.1/pr-9520 branch from 9fe515c to 8a7d5ec Compare April 16, 2020 15:24
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Apr 16, 2020
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Apr 16, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Apr 16, 2020
@solana-grimes solana-grimes merged commit cb2dd56 into v1.1 Apr 16, 2020
@codecov
Copy link

codecov bot commented Apr 16, 2020

Codecov Report

Merging #9530 into v1.1 will decrease coverage by 0.1%.
The diff coverage is 15.6%.

@@           Coverage Diff           @@
##            v1.1   #9530     +/-   ##
=======================================
- Coverage   80.8%   80.7%   -0.2%     
=======================================
  Files        277     277             
  Lines      62808   62918    +110     
=======================================
+ Hits       50799   50821     +22     
- Misses     12009   12097     +88     

@mergify mergify bot deleted the mergify/bp/v1.1/pr-9520 branch April 16, 2020 17:02
mvines pushed a commit to mvines/solana that referenced this pull request May 1, 2020
mvines added a commit that referenced this pull request May 1, 2020
…ction (#9530) (#9843)

automerge

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
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.

2 participants