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

chore: merge 0.39.0 into humble (with merged commit) #1268

Merged
merged 23 commits into from
Dec 10, 2024

Conversation

sasakisasaki
Copy link
Contributor

@sasakisasaki sasakisasaki commented Dec 10, 2024

Description

#1248

Notes for reviewers

@mitsudome-r @youtalk I think this PR's purpose is just for merged commit. But I'm welcome to perform any proposed tests and so on. Thanks!

Effects on system behavior

None.

yuki-takagi-66 and others added 22 commits October 31, 2024 18:29
…e the config file directories from universe to autoware_launch (#1201)

* prepare dir
* copy files from universe
Signed-off-by: Yuki Takagi <[email protected]>
)

* add collision_detector

Signed-off-by: Go Sakayori <[email protected]>

* change collision detector default to false

Signed-off-by: Go Sakayori <[email protected]>

---------

Signed-off-by: Go Sakayori <[email protected]>
Signed-off-by: Go Sakayori <[email protected]>
#1207)

chore: update fusion_common.param.yaml with new image projection settings

Signed-off-by: Taekjin LEE <[email protected]>
Changed loc_config_path declaration from let to arg

Signed-off-by: Shintaro Sakoda <[email protected]>
… (RT0-33893) (#1209)

RT0-33893 add dist from prev intersection

Signed-off-by: Zulfaqar Azmi <[email protected]>
* feat(rviz): add rviz config for debugging

Signed-off-by: satoshi-ota <[email protected]>

* feat(launch): select rviz config name

Signed-off-by: satoshi-ota <[email protected]>

---------

Signed-off-by: satoshi-ota <[email protected]>
Removed `publish_tf`

Signed-off-by: Shintaro Sakoda <[email protected]>
…1186)

feat(system_monitor): add config for network traffic monitor

Signed-off-by: takeshi.iwanari <[email protected]>
Co-authored-by: ito-san <[email protected]>
* set global param to override autoware state check

Signed-off-by: Daniel Sanchez <[email protected]>

* change variable for a more generic name

Signed-off-by: Daniel Sanchez <[email protected]>

* set var to false by default

Signed-off-by: Daniel Sanchez <[email protected]>

* move param to control component launch

Signed-off-by: Daniel Sanchez <[email protected]>

* change param name to be more straightforward

Signed-off-by: Daniel Sanchez <[email protected]>

---------

Signed-off-by: Daniel Sanchez <[email protected]>
Signed-off-by: Yutaka Kondo <[email protected]>
Signed-off-by: Yutaka Kondo <[email protected]>
Co-authored-by: Ryohsuke Mitsudome <[email protected]>
Signed-off-by: Yutaka Kondo <[email protected]>
@sasakisasaki sasakisasaki marked this pull request as ready for review December 10, 2024 08:12
@sasakisasaki
Copy link
Contributor Author

Sorry, it seems my commit is pushed without DCO. Let me re-push with the fix.

@sasakisasaki sasakisasaki marked this pull request as draft December 10, 2024 08:42
Copy link
Member

@youtalk youtalk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@youtalk
Copy link
Member

youtalk commented Dec 10, 2024

MERGE COMMIT!

@sasakisasaki
Copy link
Contributor Author

sasakisasaki commented Dec 10, 2024

@youtalk Thank you so much!!! Only one concern I have, ... . There are two commits with the same message (Merge branch 'humble' into release-0.39.0) as follows.

Do you think should I fix this confusing history?

@sasakisasaki sasakisasaki marked this pull request as ready for review December 10, 2024 08:48
@youtalk
Copy link
Member

youtalk commented Dec 10, 2024

git push -f to modify the commits is better.

@sasakisasaki
Copy link
Contributor Author

@youtalk Thank you for your advice, now the commit history becomes cleaner 👍

@sasakisasaki sasakisasaki merged commit a3bba6e into humble Dec 10, 2024
14 checks passed
@sasakisasaki sasakisasaki deleted the release-0.39.0 branch December 10, 2024 10:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.