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.

Sign up for GitHub

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

Jump to bottom

5 -> 6 #1359

Merged
merged 7 commits into from
Feb 24, 2022
Merged

5 -> 6 #1359

merged 7 commits into from
Feb 24, 2022

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Feb 24, 2022

➡️ Forward port

Port ign-gazebo5 to ign-gazebo6

Branch comparison: ign-gazebo6...ign-gazebo5

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

@iche033 iche033 requested a review from chapulina as a code owner February 24, 2022 05:24
@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label Feb 24, 2022
@codecov
Copy link

codecov bot commented Feb 24, 2022 •
edited
Loading

Codecov Report

Merging #1359 (e0d88f7) into ign-gazebo6 (91a79da) will increase coverage by 0.13%.
The diff coverage is 90.24%.

Impacted file tree graph

@@               Coverage Diff               @@
##           ign-gazebo6    #1359      +/-   ##
===============================================
+ Coverage        62.77%   62.91%   +0.13%     
===============================================
  Files              299      299              
  Lines            24028    24151     +123     
===============================================
+ Hits             15083    15194     +111     
- Misses            8945     8957      +12
Impacted Files Coverage Δ
src/rendering/RenderUtil.cc 36.63% <75.00%> (+0.10%) ⬆️
src/systems/scene_broadcaster/SceneBroadcaster.cc 92.82% <89.32%> (-1.02%) ⬇️
...stems/joint_state_publisher/JointStatePublisher.cc 83.60% <100.00%> (+2.47%) ⬆️

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 91a79da...e0d88f7. Read the comment docs.

@mjcarroll @ahcorde
3 -> 5 (#1360)
b45f60f 
Signed-off-by: ahcorde <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
@mjcarroll
Copy link
Contributor

Does this need the commits just merged 3->5?

@iche033
Copy link
Contributor Author

iche033 commented Feb 24, 2022

Does this need the commits just merged 3->5?

yeah I just merged with ign-gazebo5 again.

@iche033 iche033 merged commit f7cd5aa into ign-gazebo6 Feb 24, 2022
@iche033 iche033 deleted the merge_5_6_20220223 branch February 24, 2022 19:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ahcorde ahcorde ahcorde approved these changes

@mjcarroll mjcarroll mjcarroll approved these changes

@chapulina chapulina Awaiting requested review from chapulina

Assignees
No one assigned
Labels
🏯 fortress Ignition Fortress
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@iche033 @mjcarroll @ahcorde