Cherry-pick sdf9 to sdf10 #436
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
chapulina
approved these changes
Dec 14, 2020
nkoenig
approved these changes
Dec 14, 2020
…workflow (gazebosim#414) Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Currently there is a confusing error message if a file is loaded that finds a folder matching the name of a model to be included but the folder does not have a model.config file. This improves the first error message and stops further loading to prevent additional confusing messages. Signed-off-by: Steve Peters <scpeters@openrobotics.org>
) This reverts part of commit 0e77816. Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
scpeters
force-pushed
the
pick_9_to_10
branch
from
800bd05 to
f6eee1c
Compare
Codecov Report
@@ Coverage Diff @@
## sdf10 #436 +/- ##
=======================================
Coverage 87.52% 87.53%
=======================================
Files 61 61
Lines 9337 9343 +6
=======================================
+ Hits 8172 8178 +6
Misses 1165 1165
Continue to review full report at Codecov.
|
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.
Cherry-pick #390, #414, and #422 to
sdf10. Use rebase and merge.