Merge part of 10 to 11 #807
Merged
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: Ian Chen <[email protected]>
* Fix cmake warning about newlines * Find python3 in cmake, fix warning (gazebosim#328) Signed-off-by: Steve Peters <[email protected]>
Merge 6 -> 9
Signed-off-by: Jenn Nguyen <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Account for new behavior of nested models and :: syntax. Signed-off-by: Steve Peters <[email protected]>
8 tasks
chapulina
approved these changes
Dec 29, 2021
Codecov Report
@@ Coverage Diff @@
## sdf11 #807 +/- ##
=======================================
Coverage 88.89% 88.89%
=======================================
Files 73 73
Lines 11072 11072
=======================================
Hits 9843 9843
Misses 1229 1229 Continue to review full report at Codecov.
|
|
This pull request has been mentioned on Gazebo Community. There might be relevant details there: https://community.gazebosim.org/t/new-ignition-releases-2022-03-25-fortress-edifice-citadel/1343/1 |
|
This pull request has been mentioned on Gazebo Community. There might be relevant details there: https://community.gazebosim.org/t/new-ignition-releases-2022-04-13-fortress-edifice/1367/1 |
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
sdf10as of 6b53f95 (#789) tosdf10. I'm forward-porting this separately from #780 to simplify that forward port.Branch comparison: sdf11...6b53f95
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)