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.

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

2 ➡️ 3 (part 1) #296

Merged
merged 12 commits into from
Aug 20, 2020
Merged

2 ➡️ 3 (part 1) #296

merged 12 commits into from
Aug 20, 2020

Conversation

chapulina
Copy link
Contributor

Broken off #268 because that is having to many failures

nkoenig and others added 8 commits July 21, 2020 17:25
…formation (#257)

* Allow zero or more key/value pairs to be added to detection header information

Signed-off-by: Nate Koenig <[email protected]>

* Added a test

Signed-off-by: Nate Koenig <[email protected]>

Co-authored-by: Nate Koenig <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>

Co-authored-by: Nate Koenig <[email protected]>
* Failing/Crashing test showing the current behavior of PerformerDetector and levels
* Deactivate PerformerDetector if its parent model gets removed

Signed-off-by: Addisu Z. Taddese <[email protected]>
* 2.22.1 release

Signed-off-by: Nate Koenig <[email protected]>

* Update changelog and version number

Signed-off-by: Nate Koenig <[email protected]>

* typo

Signed-off-by: Nate Koenig <[email protected]>

Co-authored-by: Nate Koenig <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
@github-actions github-actions bot added the 🏰 citadel Ignition Citadel label Aug 15, 2020
@chapulina chapulina mentioned this pull request Aug 15, 2020
src/gui/Gui_TEST.cc Outdated Show resolved Hide resolved
Copy link
Contributor

@azeey azeey left a comment

Choose a reason for hiding this comment

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

LGTM! It's weird that there are codecheck errors in Github actions but not on Jenkins.

Signed-off-by: Louise Poubel <[email protected]>
@chapulina
Copy link
Contributor Author

Ignoring actions now because #269 is not being forward-ported yet.

@chapulina chapulina merged commit db6a467 into ign-gazebo3 Aug 20, 2020
@chapulina chapulina deleted the chapulina/2_to_3_pt1 branch August 20, 2020 01:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏰 citadel Ignition Citadel
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants