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

[Release] 1.10.0 merged back to develop #1901

Merged
merged 14 commits into from
Jan 22, 2019

Conversation

kfunaoka
Copy link

@kfunaoka kfunaoka commented Jan 17, 2019

Status

DEVELOPMENT

Description

Release v1.10.0 (#1682) merged back to develop

This pull request is created by the following sequence:

$ git checkout develop
$ git checkout -b release/1.10.0_back_to_develop
$ git merge --no-ff release/1.10.0

# Select ours (=develop)
$ git rm ros/src/computing/perception/detection/lidar_detector/packages/lidar_svm_detect/CHANGELOG.rst ros/src/computing/perception/detection/lidar_detector/packages/lidar_svm_detect/CMakeLists.txt ros/src/computing/perception/detection/lidar_detector/packages/lidar_svm_detect/package.xml ros/src/computing/perception/detection/lidar_tracker/libs/fusion/CHANGELOG.rst ros/src/computing/perception/detection/lidar_tracker/libs/fusion/package.xml ros/src/computing/perception/detection/lidar_tracker/packages/lidar_euclidean_track/CHANGELOG.rst ros/src/computing/perception/detection/lidar_tracker/packages/lidar_euclidean_track/package.xml ros/src/computing/perception/detection/lidar_tracker/packages/lidar_kf_track/CHANGELOG.rst ros/src/computing/perception/detection/lidar_tracker/packages/lidar_kf_track/CMakeLists.txt ros/src/computing/perception/detection/lidar_tracker/packages/lidar_kf_track/package.xml ros/src/computing/perception/detection/lidar_tracker/packages/lidar_pf_track/CHANGELOG.rst ros/src/computing/perception/detection/lidar_tracker/packages/lidar_pf_track/package.xml ros/src/computing/perception/detection/lidar_tracker/packages/obj_fusion/CHANGELOG.rst ros/src/computing/perception/detection/lidar_tracker/packages/obj_fusion/CMakeLists.txt ros/src/computing/perception/detection/lidar_tracker/packages/obj_fusion/package.xml ros/src/computing/perception/detection/lidar_tracker/packages/obj_reproj/CHANGELOG.rst ros/src/computing/perception/detection/lidar_tracker/packages/obj_reproj/CMakeLists.txt ros/src/computing/perception/detection/lidar_tracker/packages/obj_reproj/package.xml ros/src/computing/perception/detection/lidar_tracker/packages/range_fusion/CHANGELOG.rst ros/src/computing/perception/detection/lidar_tracker/packages/range_fusion/package.xml ros/src/computing/perception/detection/vision_tracker/libs/kf/CMakeLists.txt ros/src/computing/perception/detection/vision_tracker/packages/vision_dummy_track/CHANGELOG.rst ros/src/computing/perception/detection/vision_tracker/packages/vision_dummy_track/CMakeLists.txt ros/src/computing/perception/detection/vision_tracker/packages/vision_dummy_track/package.xml ros/src/computing/perception/detection/vision_tracker/packages/vision_kf_track/CHANGELOG.rst ros/src/computing/perception/detection/vision_tracker/packages/vision_kf_track/package.xml ros/src/computing/perception/detection/vision_tracker/packages/vision_klt_track/CHANGELOG.rst ros/src/computing/perception/detection/vision_tracker/packages/vision_klt_track/CMakeLists.txt ros/src/computing/perception/detection/vision_tracker/packages/vision_klt_track/package.xml ros/src/computing/planning/state/state_machine/CHANGELOG.rst ros/src/computing/planning/state/state_machine/CMakeLists.txt ros/src/computing/planning/state/state_machine/package.xml ros/src/sensing/drivers/camera/packages/hexacam/CHANGELOG.rst ros/src/sensing/drivers/camera/packages/hexacam/package.xml ros/src/sensing/fusion/packages/calibration_camera_lidar/CHANGELOG.rst ros/src/sensing/fusion/packages/calibration_camera_lidar/CMakeLists.txt ros/src/sensing/fusion/packages/calibration_camera_lidar/package.xml ros/src/sensing/fusion/packages/scan2image/CHANGELOG.rst ros/src/sensing/fusion/packages/scan2image/CMakeLists.txt ros/src/sensing/fusion/packages/scan2image/package.xml ros/src/sensing/polygon/packages/points2polygon/CHANGELOG.rst ros/src/sensing/polygon/packages/points2polygon/package.xml ros/src/util/packages/fake_drivers/CHANGELOG.rst ros/src/util/packages/fake_drivers/package.xml ros/src/util/packages/model_publisher/CHANGELOG.rst ros/src/util/packages/model_publisher/package.xml ros/src/util/packages/sample_data/CHANGELOG.rst ros/src/util/packages/sample_data/package.xml

$ git commit -m "Merge release/1.10.0 back to develop"
$ git push upstream release/1.10.0_back_to_develop

Related PRs

branch PR
release/1.10.0 to master #1898
feature/revert_b21b663 #1902

Todos

  • Review

@amc-nu amc-nu self-requested a review January 18, 2019 02:40
amc-nu
amc-nu previously approved these changes Jan 18, 2019
Copy link
Member

@amc-nu amc-nu left a comment

Choose a reason for hiding this comment

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

thanks for preparing this

@amc-nu amc-nu dismissed their stale review January 18, 2019 05:37

missing release 1.10 commits

@kfunaoka kfunaoka merged commit 4b033dc into develop Jan 22, 2019
@kfunaoka kfunaoka deleted the release/1.10.0_back_to_develop branch January 23, 2019 01:55
@mitsudome-r mitsudome-r added the version:autoware-ai Autoware.AI label Jun 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants