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

Fix service server example #128

Merged
merged 2 commits into from
Feb 10, 2022
Merged

Fix service server example #128

merged 2 commits into from
Feb 10, 2022

Conversation

pablogs9
Copy link
Member

No description provided.

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
@pablogs9
Copy link
Member Author

@mergify backport foxy main

@pablogs9 pablogs9 merged commit eb6b9b7 into galactic Feb 10, 2022
@pablogs9 pablogs9 deleted the fix/service_example branch February 10, 2022 07:22
mergify bot pushed a commit that referenced this pull request Feb 10, 2022
* Fix service server example

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

* Fix define

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

# Conflicts:
#	examples/addtwoints_server/main/main.c
#	examples/int32_sub_pub/main/main.c
#	examples/low_consumption/main/main.c
#	examples/multithread_publisher/main/main.c
#	examples/ping_pong/main/main.c
mergify bot pushed a commit that referenced this pull request Feb 10, 2022
* Fix service server example

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

* Fix define

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
(cherry picked from commit eb6b9b7)
@mergify
Copy link
Contributor

mergify bot commented Feb 10, 2022

backport foxy main

✅ Backports have been created

Hey, I reacted but my real name is @Mergifyio

pablogs9 added a commit that referenced this pull request Feb 10, 2022
* Fix service server example (#128)

* Fix service server example

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

* Fix define

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

# Conflicts:
#	examples/addtwoints_server/main/main.c
#	examples/int32_sub_pub/main/main.c
#	examples/low_consumption/main/main.c
#	examples/multithread_publisher/main/main.c
#	examples/ping_pong/main/main.c

* Solve conflics

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 Feb 10, 2022
* Fix service server example

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

* Fix define

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

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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants