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

Update ADR8 (backport #4631) #4719

Merged
merged 2 commits into from
Sep 20, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 19, 2023

This is an automatic backport of pull request #4631 done by Mergify.
Cherry-pick of 68f7ab3 has failed:

On branch mergify/bp/release/v7.3.x/pr-4631
Your branch is up to date with 'origin/release/v7.3.x'.

You are currently cherry-picking commit 68f7ab36.
  (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:
	new file:   docs/architecture/adr-008-app-caller-cbs.md
	deleted:    docs/architecture/adr-008-app-caller-cbs/adr-008-app-caller-cbs.md
	deleted:    docs/architecture/adr-008-app-caller-cbs/transfer-callback-scaffold.md
	modified:   docs/middleware/callbacks/overview.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/architecture/README.md

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

* update adr8 to latest implementation decisions

* fix link

* fixed relationship between CallbackPacketData and packet data interfaces

* update changelog

* Apply suggestions from code review

Co-authored-by: srdtrk <59252793+srdtrk@users.noreply.github.com>

* fix(docs): fix broken link

* address rest of comments

* Update docs/architecture/adr-008-app-caller-cbs.md

Co-authored-by: srdtrk <59252793+srdtrk@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: srdtrk <59252793+srdtrk@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Jim Fasarakis-Hilliard <d.f.hilliard@gmail.com>
Co-authored-by: srdtrk <59252793+srdtrk@users.noreply.github.com>

---------

Co-authored-by: srdtrk <59252793+srdtrk@users.noreply.github.com>
Co-authored-by: srdtrk <srdtrk@hotmail.com>
Co-authored-by: Jim Fasarakis-Hilliard <d.f.hilliard@gmail.com>
(cherry picked from commit 68f7ab3)

# Conflicts:
#	docs/architecture/README.md
@DimitrisJim DimitrisJim merged commit c326147 into release/v7.3.x Sep 20, 2023
15 checks passed
@DimitrisJim DimitrisJim deleted the mergify/bp/release/v7.3.x/pr-4631 branch September 20, 2023 07:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants