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

Populate memo in bigtable transaction structs (backport #19512) #19606

Merged
merged 2 commits into from
Sep 3, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 3, 2021

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

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

You are currently cherry-picking commit f4ae450f3.
  (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:   storage-bigtable/src/lib.rs
	new file:   transaction-status/src/extract_memos.rs
	modified:   transaction-status/src/lib.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   transaction-status/src/parse_instruction.rs

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/

* Populate memo in bigtable transaction structs

* Preface memos with len

(cherry picked from commit f4ae450)

# Conflicts:
#	transaction-status/src/parse_instruction.rs
@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 Sep 3, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Sep 3, 2021

automerge label removed due to a CI failure

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

codecov bot commented Sep 3, 2021

Codecov Report

Merging #19606 (e2179b2) into v1.6 (3606de5) will decrease coverage by 0.0%.
The diff coverage is 67.1%.

@@            Coverage Diff            @@
##             v1.6   #19606     +/-   ##
=========================================
- Coverage    82.3%    82.3%   -0.1%     
=========================================
  Files         423      424      +1     
  Lines      118582   118646     +64     
=========================================
+ Hits        97619    97665     +46     
- Misses      20963    20981     +18     

@mergify mergify bot merged commit db65b4e into v1.6 Sep 3, 2021
@mergify mergify bot deleted the mergify/bp/v1.6/pr-19512 branch September 3, 2021 09:26
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant