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

Master #63

Merged
merged 19 commits into from
Jul 1, 2021
Merged

Master #63

merged 19 commits into from
Jul 1, 2021

Conversation

SaikrishnaBairamoni
Copy link

PR Details

This PR syncs sync_develop_with_3.6 back up with master for release 3.6.0.

Description

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.

JonSmet and others added 19 commits February 3, 2021 12:44
@JonSmet
Updates to hooks/pre_build for release build process.
fefa021
@JonSmet
Fix variable typo.
ee926ce
@JonSmet
Update comments in hooks/pre_build.
bd6bb95
@kjrush
Merge pull request #53 from usdot-fhwa-stol/release/autobuild_test
413edcc 
hooks/pre_build regex updates for release image auto build process
@kjrush
Adjust pre_build hook for release builds
64ab093
@JonSmet
Merge pull request #57 from usdot-fhwa-stol/fix/pre_build_regex
6a27799 
Adjust pre_build hook for release builds
@JonSmet
Remove image_proc lines
291848c
@JonSmet
Update image dimensions
fc19b80
@JonSmet
Add related issue link in comment
82782fd
@msmcconnell
Merge pull request #58 from usdot-fhwa-stol/fix/image-dimensions
91f884a 
Fix/image dimensions
@SaikrishnaBairamoni
Updating version numbers for CARMA release 3.6.0
1415405
@SaikrishnaBairamoni
Update version number 3.6.0
751d731
@SaikrishnaBairamoni
Merge branch 'develop' into release/zephyr
ddc3123
@SaikrishnaBairamoni
Revert "Merge branch 'develop' into release/zephyr"
bd16be2 
This reverts commit ddc3123, reversing
changes made to 91f884a.
@SaikrishnaBairamoni
Update config.yml
c33e22d
@SaikrishnaBairamoni
Update checkout.bash
54fc14d
@SaikrishnaBairamoni
Update Dockerfile
2417c13
@msmcconnell
Merge branch 'master' into release/zephyr
dd434c0
@msmcconnell
Merge pull request #61 from usdot-fhwa-stol/release/zephyr
7791fcd 
Release/zephyr
@sonarcloud
Copy link

sonarcloud bot commented Jun 30, 2021

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@SaikrishnaBairamoni SaikrishnaBairamoni merged commit 9ea30a7 into sync_develop_with_3_6 Jul 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adev4a adev4a adev4a 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
@SaikrishnaBairamoni @adev4a @JonSmet @kjrush @msmcconnell