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

Release/rx7 #9

Merged
merged 54 commits into from
Jul 17, 2019
Merged

Release/rx7 #9

merged 54 commits into from
Jul 17, 2019

Conversation

darrelld05
Copy link

merge into master for Pre-Relase 3.0.0

kjrush and others added 30 commits February 4, 2019 13:43
@kjrush
Apply CARMA dockerization config
b67e87f
@aswath1
update with driver status and alert
648e658
@aswath1
updates and fix .h
c5f68a4
@aswath1
fix
58c91e2
@aswath1
version 1
9afce43
Add sonarcloud and circle ci support to repo
1cf0f59
@qswawrq
add build dependencies
748ebeb
@qswawrq
Update Dockerfile
3af78db
Merge pull request #3 from usdot-fhwa-stol/feature/update-docker-depe…
420f63b 
…ndencies

Add build dependencies
Updated image
b75b6dc
@aswath1
version 2
6d47ef6
debug
5076f35
change arge order
03dc050
Try memory limit
8661b4c
Force cmake
6653a26
undo changes
f570746
Try -j arg
85b5941
Fix branch name
d9ccd6a
Fix bug in properties file
c43a0fd
debug print
b71ea04
Change print location
4eb4f23
List remote branches
b5fed02
More prints
5ea24b4
Debug print
1019a8c
Remove arg
164f0f5
Hard code base
1dd4ea0
Try again
18cac1b
Trying another change
1cde6d1
@aswath1
updated with status_camera class
bdaa04e
@aswath1
update based on comments
7f3a3df
Michael McConnell and others added 23 commits February 12, 2019 09:42
Undo changes to config
64919c7
Merge pull request #4 from usdot-fhwa-stol/feature/sonarcloud_ci
5e7a21f 
Add sonarcloud and circle ci support to repo
@qswawrq
Merge branch 'develop' into feature/pub_sub_dis_alert
e70f711
fix comment
80ad168
@qswawrq
Merge pull request #5 from usdot-fhwa-stol/feature/sonarcloud_ci
c899157 
fix comment
@aswath1
new updates
476a232
@aswath1
final version
046a13a
@aswath1
version 3
4f2ea32
@aswath1
Merge branch 'feature/pub_sub_dis_alert' of https://github.com/usdot-…
0b8ab61 
…fhwa-stol/CARMAAvtVimbaDriver into feature/pub_sub_dis_alert
@aswath1
version 4
67f730e
@aswath1
final version 0 sonarsmell
0bc4fd9
@aswath1
test1
e580f5a
@aswath1
update on commit 4fe
4e53374
@aswath1
Mako Driver
33a0431
@qswawrq
Merge pull request #2 from usdot-fhwa-stol/feature/pub_sub_dis_alert
0b8ada9 
update with driver status and alert
@kjrush
Merge branch 'develop' into feature/dockerization
5dde73b
Merge pull request #1 from usdot-fhwa-stol/feature/dockerization
0c4ffed 
Apply CARMA dockerization config
Add code coverage to sonar cloud ci
469c28b
@kjrush
Merge pull request #7 from usdot-fhwa-stol/feature/code_coverage
a8b902b 
Add code coverage to sonar cloud ci
@kjrush
Add new docker version detection scripts
b631f7b
@kjrush
Update build-image.sh to match main repo
61c727f
@kjrush
Update with newest repo-agnostic docker tagging
d9da51c
@kjrush
Merge pull request #8 from usdot-fhwa-stol/feature/docker-refactor
a9dc407 
Feature/docker refactor
@darrelld05 darrelld05 closed this Jul 17, 2019
@darrelld05 darrelld05 reopened this Jul 17, 2019
@darrelld05
Copy link
Author

pull request is ok

@darrelld05 darrelld05 requested a review from maefromm July 17, 2019 19:01
maefromm
maefromm approved these changes Jul 17, 2019
View reviewed changes
Copy link

@maefromm maefromm left a comment

Choose a reason for hiding this comment

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

Confirmed with @qswawrq that "kinetic" branch is equivalent to master. And that "Feature/mobileye testing" that's currently oustanding PR with Mike, doesn't need to be included in this release.

@darrelld05 darrelld05 merged commit 6983419 into kinetic Jul 17, 2019
@jtbaird jtbaird deleted the release/RX7 branch May 18, 2020 20:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@maefromm maefromm maefromm 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
@darrelld05 @maefromm @kjrush @aswath1 @qswawrq