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 ign-gazebo6 ➡️ main (part 1) #1630

Merged
merged 15 commits into from
Aug 5, 2022
Merged

Merge ign-gazebo6 ➡️ main (part 1) #1630

merged 15 commits into from
Aug 5, 2022

Conversation

chapulina
Copy link
Contributor

@chapulina chapulina commented Aug 5, 2022

➡️ Forward port

Port ign-gazebo6 ➡️ main

Branch comparison: main...ign-gazebo6

Breaking it into several parts since the diff is so large.

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

chapulina and others added 14 commits June 3, 2022 08:48
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>

Co-authored-by: Michael Carroll <[email protected]>
Signed-off-by: Mabel Zhang <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>

Co-authored-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>

Co-authored-by: Aditya Pande <[email protected]>
Signed-off-by: AmrElsersy <[email protected]>
Signed-off-by: Ashton Larkin <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>

Co-authored-by: AmrElsersy <[email protected]>
Co-authored-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: Louise Poubel <[email protected]>
@github-actions github-actions bot added the 🌱 garden Ignition Garden label Aug 5, 2022
@chapulina chapulina changed the title Merge ign-gazebo6 ➡️ main Merge ign-gazebo6 ➡️ main (part 1) Aug 5, 2022
chapulina added a commit that referenced this pull request Aug 5, 2022
Signed-off-by: Louise Poubel <[email protected]>
chapulina added a commit that referenced this pull request Aug 5, 2022
Signed-off-by: Louise Poubel <[email protected]>
@chapulina chapulina force-pushed the chapulina/6_to_7_pt1 branch from a2afece to 021b3b0 Compare August 5, 2022 00:28
Signed-off-by: Louise Poubel <[email protected]>
@chapulina
Copy link
Contributor Author

chapulina commented Aug 5, 2022

Test failures - flake or not flake?

@chapulina chapulina merged commit 63bbc2d into main Aug 5, 2022
@chapulina chapulina deleted the chapulina/6_to_7_pt1 branch August 5, 2022 16:15
@j-rivero j-rivero mentioned this pull request Sep 16, 2022
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🌱 garden Ignition Garden
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

7 participants