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

Reduce error handling static size (backport #14) #16

Merged
merged 2 commits into from
Mar 8, 2022

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Mar 8, 2022

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

On branch mergify/bp/foxy/pr-14
Your branch is up to date with 'origin/foxy'.

You are currently cherry-picking commit 1176652.
  (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:   src/error_handling_helpers.h

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   include/rcutils/error_handling.h

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

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
(cherry picked from commit 1176652)

# Conflicts:
#	include/rcutils/error_handling.h
@mergify mergify bot added the conflicts label Mar 8, 2022
Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
@pablogs9 pablogs9 merged commit b47fb4b into foxy Mar 8, 2022
@pablogs9 pablogs9 deleted the mergify/bp/foxy/pr-14 branch March 8, 2022 13:22
pablogs9 added a commit that referenced this pull request May 30, 2022
* Reduce error handling static size (#14)

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
(cherry picked from commit 1176652)

# Conflicts:
#	include/rcutils/error_handling.h

* Fix conflicts

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>

Co-authored-by: Pablo Garrido <pablogs9@gmail.com>
pablogs9 added a commit that referenced this pull request Jul 26, 2022
* Reduce error handling static size (#14)

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
(cherry picked from commit 1176652)

# Conflicts:
#	include/rcutils/error_handling.h

* Fix conflicts

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>

Co-authored-by: Pablo Garrido <pablogs9@gmail.com>
pablogs9 added a commit that referenced this pull request Oct 3, 2022
* Reduce error handling static size (#14)

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
(cherry picked from commit 1176652)

# Conflicts:
#	include/rcutils/error_handling.h

* Fix conflicts

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>

Co-authored-by: Pablo Garrido <pablogs9@gmail.com>
pablogs9 added a commit that referenced this pull request Mar 17, 2023
* Reduce error handling static size (#14)

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
(cherry picked from commit 1176652)

# Conflicts:
#	include/rcutils/error_handling.h

* Fix conflicts

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>

Co-authored-by: Pablo Garrido <pablogs9@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
1 participant