Merge 3 ➡️ 6 part1 #1602
Merged
Merge 3 ➡️ 6 part1 #1602
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Addisu Z. Taddese <[email protected]> Signed-off-by: Jorge Perez <[email protected]> Co-authored-by: Addisu Z. Taddese <[email protected]>
chapulina
approved these changes
Jul 19, 2022
8 tasks
scpeters
force-pushed
the
scpeters/merge36
branch
from
a791aee
to
9a67b5d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
➡️ Forward port
Port
ign-gazebo3as of abe0ff6 toign-gazebo6. There were a fair number of conflicts with this and other PRs, so I started with #1546.IGN_UTILS_TEST_DISABLED_ON_MACto some tests moved fromServer_TEST.cctomultiple_servers.ccign-gazebo6already hadIGN_UTILS_TEST_DISABLED_ON_WIN32and Disable MacOS flakies Citadel #1545 addedIGN_UTILS_TEST_DISABLED_ON_MAC, so I merged them intoIGN_UTILS_TEST_ENABLED_ONLY_ON_LINUXBranch comparison: ign-gazebo6...abe0ff6
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)