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

Apply fix from issue #112 #121

Merged
merged 12 commits into from
Jul 12, 2021
Merged

Apply fix from issue #112 #121

merged 12 commits into from
Jul 12, 2021

Conversation

adamlm
Copy link
Contributor

@adamlm adamlm commented Jul 12, 2021

PR Details

Description

PR applies fix from #112 to the noetic/develop branch, which is also affected.

Related Issue

Fixes #112 for the noetic/develop branch.

Motivation and Context

Issue #112 applies to both develop and noetic/develop branches, but PR #114 was only applied to develop.

How Has This Been Tested?

Updates from PR #114 have been successfully tested on a clean clone of the noetic/develop branch.

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.

SaikrishnaBairamoni and others added 12 commits June 8, 2021 12:30
@SaikrishnaBairamoni
update version number
c6d024c
@MishkaMN
first
5a989ed
@MishkaMN
add comment
18ce8f5
@dan-du-car
Merge pull request #106 from usdot-fhwa-stol/feature/tcr-info-for-ui
3692f67 
TCR polygon support
Merge with develop
0a7b2de
@msmcconnell
Merge pull request #107 from usdot-fhwa-stol/sync_develop_with_zephyr
3e38097 
Sync develop with zephyr
@lewisid
Commit enumeration change to UpcomingLaneChange.msg (#111)
f1d2441
@lewisid
Commit changes to UpcomingLaneChangeStatus.msg (#116)
16777ed
@msmcconnell
Merge pull request #115 from usdot-fhwa-stol/release/zephyr
815aec1 
Release/zephyr
@adamlm
112 - Replace UTF-8 quotes with ASCII quotes (#114)
7383c1c 
The previous quote marks were UTF-8 characters for left quote and right quote,
resulting in the file being UTF-8 encoded. This causes file reading issues on
environments with a non-UTF-8 locale (e.g., a POSIX locale). Replacing the
UTF-8 quote marks with ASCII versions fixes the issue.
@adev4a
Merge pull request #118 from usdot-fhwa-stol/master
6261146 
Master
@adev4a
Merge pull request #119 from usdot-fhwa-stol/Sync_develop_with_3-6
500e167 
Sync develop with 3 6
@msmcconnell msmcconnell merged commit 2a49d34 into noetic/develop Jul 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@msmcconnell msmcconnell msmcconnell 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.
7 participants
@adamlm @msmcconnell @SaikrishnaBairamoni @MishkaMN @dan-du-car @lewisid @adev4a