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 5 -> main #336

Merged
merged 10 commits into from
Mar 21, 2022
Merged

Merge 5 -> main #336

merged 10 commits into from
Mar 21, 2022

Conversation

scpeters
Copy link
Member

➡️ Forward port

Port ign-physics5 to main

Branch comparison: main...ign-physics5

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

chapulina and others added 10 commits November 11, 2021 10:16
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Jochen Sprickerhof <[email protected]>
* Copy packages-focal.apt to packages-jammy.apt

Signed-off-by: Steve Peters <[email protected]>
@scpeters scpeters requested review from azeey and mxgrey as code owners March 18, 2022 21:49
@scpeters scpeters changed the title Merge5main Merge 5 -> main Mar 18, 2022
@github-actions github-actions bot added the 🌱 garden Ignition Garden label Mar 18, 2022
@codecov
Copy link

codecov bot commented Mar 18, 2022

Codecov Report

Merging #336 (0b73883) into main (ba10632) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main     #336   +/-   ##
=======================================
  Coverage   75.65%   75.65%           
=======================================
  Files         128      128           
  Lines        5537     5537           
=======================================
  Hits         4189     4189           
  Misses       1348     1348           

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 ba10632...0b73883. Read the comment docs.

@scpeters
Copy link
Member Author

@scpeters scpeters merged commit d140cfc into main Mar 21, 2022
@scpeters scpeters deleted the merge5main branch March 21, 2022 16:58
@chapulina chapulina mentioned this pull request Mar 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🌱 garden Ignition Garden
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants