Skip to content

Update documentation to point to new default DDS (bp #1000) (bp #1002)#1004

Closed
mergify[bot] wants to merge 5 commits intodashingfrom
mergify/bp/dashing/pr-1002
Closed

Update documentation to point to new default DDS (bp #1000) (bp #1002)#1004
mergify[bot] wants to merge 5 commits intodashingfrom
mergify/bp/dashing/pr-1002

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jan 12, 2021

This is an automated backport of pull request #1002 done by Mergify

Cherry-pick of 9a25574 has failed:

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

You are currently cherry-picking commit 9a25574.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   source/Tutorials/Working-with-multiple-RMW-implementations.rst

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 3bc9cae has failed:

On branch mergify/bp/dashing/pr-1002
Your branch is ahead of 'origin/dashing' by 4 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 3bc9cae.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   source/Tutorials/Working-with-multiple-RMW-implementations.rst

no changes added to commit (use "git add" and/or "git commit -a")

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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/

Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
(cherry picked from commit 1edebe3)

# Conflicts:
#	source/Tutorials/Working-with-multiple-RMW-implementations.rst
(cherry picked from commit 9a25574)

# Conflicts:
#	source/Tutorials/Working-with-multiple-RMW-implementations.rst
Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
(cherry picked from commit 22800cd)
(cherry picked from commit 47bc1cd)
Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
(cherry picked from commit d944d4d)
(cherry picked from commit 29bf5f3)
Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
(cherry picked from commit 9271039)
(cherry picked from commit f3deadd)
Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
(cherry picked from commit 3bc9cae)

# Conflicts:
#	source/Tutorials/Working-with-multiple-RMW-implementations.rst
@mergify mergify bot added the conflicts label Jan 12, 2021
@mjcarroll mjcarroll had a problem deploying to ros2-documentation-pr-1004 January 12, 2021 15:07 Failure
@clalancette
Copy link
Contributor

This one doesn't need to be backported to Dashing, so closing.

@mergify mergify bot deleted the mergify/bp/dashing/pr-1002 branch January 12, 2021 15:10
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