Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 6 -> 9 #774

Merged
merged 3 commits into from
Dec 6, 2021
Merged

Merge 6 -> 9 #774

merged 3 commits into from
Dec 6, 2021

Conversation

scpeters
Copy link
Member

@scpeters scpeters commented Dec 6, 2021

➡️ Forward port

Port sdf6 to sdf9. These changes are already on sdf10.

Branch comparison: sdf9...sdf6

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

iche033 and others added 3 commits November 8, 2021 12:00
* Fix cmake warning about newlines
* Find python3 in cmake, fix warning (gazebosim#328)

Signed-off-by: Steve Peters <[email protected]>
@scpeters scpeters requested review from azeey and jennuine December 6, 2021 20:53
@github-actions github-actions bot added Gazebo 1️1️ Dependency of Gazebo classic version 11 🏰 citadel Ignition Citadel labels Dec 6, 2021
@codecov-commenter
Copy link

Codecov Report

Merging #774 (9ba8ea1) into sdf9 (1a05444) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##             sdf9     #774   +/-   ##
=======================================
  Coverage   87.46%   87.46%           
=======================================
  Files          63       63           
  Lines        9893     9893           
=======================================
  Hits         8653     8653           
  Misses       1240     1240           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1a05444...9ba8ea1. Read the comment docs.

@scpeters scpeters merged commit 3266e33 into gazebosim:sdf9 Dec 6, 2021
@scpeters scpeters deleted the merge_6_9 branch December 6, 2021 23:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏰 citadel Ignition Citadel Gazebo 1️1️ Dependency of Gazebo classic version 11
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants