Merge forward sdf8 -> sdf9 #445
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
* [sdf8] Changelog links to BitBucket backup Signed-off-by: Louise Poubel <louise@openrobotics.org> * more fixes, new version of script Signed-off-by: Louise Poubel <louise@openrobotics.org> * [sdf7] Changelog links to BitBucket backup (gazebosim#238) Signed-off-by: Louise Poubel <louise@openrobotics.org> * Update some more bitbucket issue references Signed-off-by: Steven Peters <scpeters@openrobotics.org> Co-authored-by: Steven Peters <scpeters@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
* Simplify and fix copy constructors, restructure tests and increase coverage * Add joint and link tests * Add changelog Signed-off-by: Luca Della Vedova <luca@openrobotics.org> Co-authored-by: Ian Chen <ichen@osrfoundation.org> Co-authored-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org> Co-authored-by: Nate Koenig <nate@openrobotics.org>
* Also use python3 in test Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org> Co-authored-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
…workflow (gazebosim#414) Signed-off-by: Steve Peters <scpeters@openrobotics.org>
azeey
approved these changes
Dec 22, 2020
chapulina
approved these changes
Dec 22, 2020
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.
We've avoid merge commits between the release branches here, but it's more effort than it's worth. Let's do forward merges for consistency with other ignition repositories.
Be sure to use a merge commit for this. There are no changes because we've already cherry-picked everything.