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 #143

Merged
merged 11 commits into from
Nov 2, 2021
Merged

Sync develop with elise #143

merged 11 commits into from
Nov 2, 2021

Conversation

msmcconnell
Copy link
Contributor

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 11 commits June 25, 2021 08:52
@mjeronimo
Update to C++14 (#113)
6bcefc4
@mjeronimo
Update to package format 3 and run xmllint (#117)
1f45c8d 
* Update to C++14

* Update to package format 3 and run xmllint
@msmcconnell
Update tags for noetic develop (#120)
d35d4d7
@msmcconnell
Merge pull request #121 from usdot-fhwa-stol/develop
2a49d34 
Apply fix from issue #112
@msmcconnell
Update config.yml to use colcon for the build and test commands (#124)
09c653b
Merge branch 'master' into feature/sync_noetic_with_3.7.0
4187038
@msmcconnell
Merge pull request #133 from usdot-fhwa-stol/feature/sync_noetic_with…
5bc81b8 
…_3.7.0

Feature/sync noetic with 3.7.0
Merge branch 'develop' into sync_noetic_with_develop
389c52b
@msmcconnell
Merge pull request #141 from usdot-fhwa-stol/sync_noetic_with_develop
2eaa343 
Sync noetic with develop after the 3.8.0 release
@SaikrishnaBairamoni
update config to point candidate
f4afa6d
Sync develop with release/elise
f5959b4
@SaikrishnaBairamoni SaikrishnaBairamoni merged commit 4772fa9 into develop Nov 2, 2021
@SaikrishnaBairamoni SaikrishnaBairamoni deleted the sync_develop_with_elise branch November 2, 2021 16:33
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.
3 participants
@msmcconnell @SaikrishnaBairamoni @mjeronimo