Skip to content

Extend the load report tool to include transactions' hashes (backport #9509)#9514

Merged
sergio-mena merged 3 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-9509
Oct 5, 2022
Merged

Extend the load report tool to include transactions' hashes (backport #9509)#9514
sergio-mena merged 3 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-9509

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Oct 5, 2022

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

On branch mergify/bp/v0.34.x/pr-9509
Your branch is up to date with 'origin/v0.34.x'.

You are currently cherry-picking commit cdd3479f2.
  (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:   test/loadtime/report/report.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/loadtime/cmd/report/main.go

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.com

* Add transaction hash to raw data

* Add hash in formatted output

* Cosmetic

(cherry picked from commit cdd3479)

# Conflicts:
#	test/loadtime/cmd/report/main.go
@mergify mergify bot requested a review from a team October 5, 2022 19:17
@mergify mergify bot added the conflicts label Oct 5, 2022
@sergio-mena
Copy link
Contributor

Backporting as it is not production code

@sergio-mena sergio-mena merged commit df5ba80 into v0.34.x Oct 5, 2022
@sergio-mena sergio-mena deleted the mergify/bp/v0.34.x/pr-9509 branch October 5, 2022 19:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant