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

Sync develop with elise #75

Merged
merged 14 commits into from
Nov 2, 2021
Merged

Sync develop with elise #75

merged 14 commits into from
Nov 2, 2021

Conversation

msmcconnell
Copy link

PR Details

Description

Sync develop with release/elise

Related Issue

Motivation and Context

How Has This Been Tested?

Types of changes

  • Defect fix (non-breaking change that fixes an issue)
  • New feature (non-breaking change that adds functionality)
  • Breaking change (fix or feature that cause existing functionality to change)

Checklist:

  • I have added any new packages to the sonar-scanner.properties file
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
    CARMA Contributing Guide
  • I have added tests to cover my changes.
  • All new and existing tests passed.

mjeronimo and others added 14 commits May 25, 2021 16:50
@mjeronimo
Port scripts to Python 3
21f47c9
@msmcconnell
Merge pull request #59 from mjeronimo/feature/ros-noetic-port
2cc32ba 
Port scripts to Python 3
@mjeronimo
Update to C++14 (#60)
12afc9c
@pmusau17
checkout tags (#62)
e33b11f 
Signed-off-by: pmusau17 <pmusau13ster@gmail.com>
@msmcconnell
Fix/updated develop tags (#65)
0bfff13 
* Update tags for noetic develop

* Update checkout.bash for CI

* Fix bug in build-image.sh -d arg
Merge branch 'master' into feature/sync_noetic_with_3.7.0
46c76ca
@msmcconnell
Merge pull request #67 from usdot-fhwa-stol/feature/sync_noetic_with_…
2b7f075 
…3.7.0

Feature/sync noetic with 3.7.0
Fix build error where kinetic was sourced instead of noetic
fd30783
merge develop into noetic/develop after 3.8.0 release
10c09b4
@msmcconnell
Merge pull request #73 from usdot-fhwa-stol/sync_noetic_with_develop
461d7b2 
Sync noetic with develop
@SaikrishnaBairamoni
updated docker tag to point candidate
ae8fd6b
Update sdk version
9abbe33
@kjrush
Merge pull request #74 from usdot-fhwa-stol/fix/update_vimba_sdk
9339672 
Update sdk version
Sync develop with release/elise
7879948
@SaikrishnaBairamoni SaikrishnaBairamoni merged commit b81dc3d into develop Nov 2, 2021
@SaikrishnaBairamoni SaikrishnaBairamoni deleted the sync_develop_with_elise branch November 2, 2021 17:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SaikrishnaBairamoni SaikrishnaBairamoni SaikrishnaBairamoni approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@msmcconnell @SaikrishnaBairamoni @mjeronimo @pmusau17 @kjrush