Skip to content

Avoid duplication of pylons in enum#497

Merged
clemenshabedank merged 18 commits intomasterfrom
bugfix/sm/pylons
May 18, 2021
Merged

Avoid duplication of pylons in enum#497
clemenshabedank merged 18 commits intomasterfrom
bugfix/sm/pylons

Conversation

@clemenshabedank
Copy link
Copy Markdown
Contributor

@clemenshabedank clemenshabedank commented Mar 15, 2021 •
edited
Loading

Removed cones as an example from TYPE_CONSTRUCTION_SITE_ELEMENT because there is a separate TYPE_PYLON.
@kmeids can you have a look please. @ThomasNaderBMW FYI

Take this checklist as orientation for yourself, if this PR is ready for the Change Control Board:

  • My suggestion follows the style and contributors guidelines.
  • I have taken care about the documentation.
  • I have done the DCO signoff.
  • My changes generate no errors when passing CI tests.
  • I have successfully implemented and tested my fix/feature locally.
  • Appropriate reviewer(s) are assigned.

If you can’t check all of them, please explain why.
If all boxes are checked or commented and you have achieved at least one positive review, you can assign the label ReadyForCCBReview!

@clemenshabedank clemenshabedank added SensorModeling The Group in the ASAM development project working on sensor modeling topics. Bug Problems in the build system, build scripts, etc or faults in the interface. labels Mar 15, 2021
@kmeids
Copy link
Copy Markdown

kmeids commented Apr 16, 2021

Output from SM meeting 16.04.2021:

  1. No objection on removing "cones" from the description of "TYPE_CONSTRUCTION_SITE_ELEMENT".

@kmeids kmeids added the ReadyForCCBReview Indicates that this PR is ready for a final review and merge by the CCB. label Apr 16, 2021
@kmeids kmeids added ReadyToMerge This PR has been approved to merge and will be merged by a member of the CCB. and removed ReadyForCCBReview Indicates that this PR is ready for a final review and merge by the CCB. labels May 12, 2021
@kmeids
Copy link
Copy Markdown

kmeids commented May 12, 2021

Output CCB 12.05.2021:

  1. @clemenshabedank please do the DCO and merge.

kmeids
kmeids approved these changes May 12, 2021
View reviewed changes
Copy link
Copy Markdown

@kmeids kmeids left a comment

Choose a reason for hiding this comment

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

Output CCB 12.05.2021:

  1. @clemenshabedank Please fix DCO and merge

@clemenshabedank
Merge branch 'master' into bugfix/sm/pylons
9b203bb 
Signed-off-by: Habedank Clemens <qxs2704@europe.bmw.corp>
vkresch and others added 16 commits May 18, 2021 11:38
@vkresch
Added release notes for 3.3.0
6db66ba 
Signed-off-by: Viktor Kreschenski <viktor.kreschenski@altran.com>
Signed-off-by: Habedank Clemens <qxs2704@europe.bmw.corp>
@pmai
Add 3.3.0 release notes to TOC document
6b44b2e 
Signed-off-by: Pierre R. Mai <pmai@pmsf.de>
Signed-off-by: Habedank Clemens <qxs2704@europe.bmw.corp>
@hschoen
Correct typos in model_reference comments
373b8af 
Signed-off-by: Pierre R. Mai <pmai@pmsf.de>
Signed-off-by: Habedank Clemens <qxs2704@europe.bmw.corp>
@pmai
Fix old version info in release 3.3.0
cb4ba05 
Signed-off-by: Pierre R. Mai <pmai@pmsf.de>
Signed-off-by: Habedank Clemens <qxs2704@europe.bmw.corp>
updated release notes for bugfix
cc9e734 
Signed-off-by: Stefan Cyliax <stefan.cyliax@asam.net>
Signed-off-by: Habedank Clemens <qxs2704@europe.bmw.corp>
@pmai
Remove obsolete image and update release notes
13224ce 
Signed-off-by: Pierre R. Mai <pmai@pmsf.de>
Signed-off-by: Habedank Clemens <qxs2704@europe.bmw.corp>
@pmai
Initial GitHub Actions CPP ProtoBuf Build
fbbcc9e 
Signed-off-by: Pierre R. Mai <pmai@pmsf.de>
Signed-off-by: Habedank Clemens <qxs2704@europe.bmw.corp>
@pmai
Add Python ProtoBuf build
69f1c91 
Signed-off-by: Pierre R. Mai <pmai@pmsf.de>
Signed-off-by: Habedank Clemens <qxs2704@europe.bmw.corp>
@pmai
Add documentation generation
eb1e008 
Signed-off-by: Pierre R. Mai <pmai@pmsf.de>
Signed-off-by: Habedank Clemens <qxs2704@europe.bmw.corp>
@pmai
Add Proto3 Test Builds
2a3c8de 
Signed-off-by: Pierre R. Mai <pmai@pmsf.de>
Signed-off-by: Habedank Clemens <qxs2704@europe.bmw.corp>
@pmai
Adjust version number for Doxygen documentation
222b208 
Signed-off-by: Pierre R. Mai <pmai@pmsf.de>
Signed-off-by: Habedank Clemens <qxs2704@europe.bmw.corp>
@pmai
Update Build status badge to GitHub Actions CI
66ff072 
Signed-off-by: Pierre R. Mai <pmai@pmsf.de>
Signed-off-by: Habedank Clemens <qxs2704@europe.bmw.corp>
added deploy to gh-pages and update to current protobuf version
c674c97 
Signed-off-by: Stefan Cyliax <stefan.cyliax@asam.net>
Signed-off-by: Habedank Clemens <qxs2704@europe.bmw.corp>
preparation of badge address to target repo
ba1a165 
Signed-off-by: Stefan Cyliax <stefan.cyliax@asam.net>
Signed-off-by: Habedank Clemens <qxs2704@europe.bmw.corp>
@MarcelOliver
Add color orange as suggested in issue #504 - Harmonization of road m…
7a10507 
…ark colors with OpenDRIVE

Signed-off-by: Pierre R. Mai <pmai@pmsf.de>
Signed-off-by: Habedank Clemens <qxs2704@europe.bmw.corp>
Merge branch 'bugfix/sm/pylons' of https://github.com/OpenSimulationI…
67694c3 
…nterface/open-simulation-interface into bugfix/sm/pylons

Signed-off-by: Habedank Clemens <qxs2704@europe.bmw.corp>
@clemenshabedank clemenshabedank merged commit aeb8541 into master May 18, 2021
@clemenshabedank clemenshabedank deleted the bugfix/sm/pylons branch May 18, 2021 10:10
@clemenshabedank clemenshabedank added this to the V3.4.0 milestone Jun 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kmeids kmeids kmeids approved these changes

@ThomasNaderBMW ThomasNaderBMW Awaiting requested review from ThomasNaderBMW

Assignees

No one assigned

Labels

Bug Problems in the build system, build scripts, etc or faults in the interface. ReadyToMerge This PR has been approved to merge and will be merged by a member of the CCB. SensorModeling The Group in the ASAM development project working on sensor modeling topics.

Projects

None yet

Milestone

V3.4.0

Development

Successfully merging this pull request may close these issues.

6 participants

@clemenshabedank @kmeids @vkresch @pmai @hschoen @MarcelOliver