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

Fix Apache license version (backport to edifice) #327

Merged
merged 1 commit into from
Jan 25, 2022

Conversation

scpeters
Copy link
Member

Backport #325 to edifice. Use rebase and merge.

@scpeters scpeters requested a review from ahcorde January 24, 2022 19:52
@scpeters scpeters requested review from azeey and mxgrey as code owners January 24, 2022 19:52
@github-actions github-actions bot added the 🏢 edifice Ignition Edifice label Jan 24, 2022
@chapulina
Copy link
Contributor

It could be backported to Citadel and then it joins the forward-port train to Edifice

@codecov
Copy link

codecov bot commented Jan 24, 2022

Codecov Report

Merging #327 (a18e5d6) into ign-physics4 (9e03297) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@              Coverage Diff              @@
##           ign-physics4     #327   +/-   ##
=============================================
  Coverage         75.84%   75.84%           
=============================================
  Files               127      127           
  Lines              5734     5734           
=============================================
  Hits               4349     4349           
  Misses             1385     1385           

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 9e03297...a18e5d6. Read the comment docs.

@scpeters
Copy link
Member Author

It could be backported to Citadel and then it joins the forward-port train to Edifice

I made the backport to Citadel first in #326, but one of the modified files did not exist in Citadel, so I need to backport here as well

@scpeters
Copy link
Member Author

It could be backported to Citadel and then it joins the forward-port train to Edifice

I made the backport to Citadel first in #326, but one of the modified files did not exist in Citadel, so I need to backport here as well

I suppose I could have made a separate commit that only touched dartsim/src/WorldFeatures_TEST.cc, but it was easier to just cherry pick the whole commit

@scpeters
Copy link
Member Author

It could be backported to Citadel and then it joins the forward-port train to Edifice

I made the backport to Citadel first in #326, but one of the modified files did not exist in Citadel, so I need to backport here as well

dartsim/src/WorldFeatures_TEST.cc was added to edifice in https://github.com/ignitionrobotics/ign-physics/pull/225/files#diff-5f37fd0659e70bb363f58b8b28d459b9007ee5a8b9d5a382c3875ff320a27550R4

@scpeters scpeters merged commit 1b3b6b1 into gazebosim:ign-physics4 Jan 25, 2022
@scpeters scpeters deleted the pick_apache3_edifice branch January 25, 2022 11:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏢 edifice Ignition Edifice
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants