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

Revert "Visibility followup for marker" #369

Merged
merged 2 commits into from
Dec 21, 2018

Conversation

wjwwood
Copy link
Member

@wjwwood wjwwood commented Dec 21, 2018

Reverts #297

This appeared to cause issues in our CI, so I'll revert and look into it when I have time. See:

@wjwwood wjwwood self-assigned this Dec 21, 2018
@wjwwood wjwwood added the in progress Actively being worked on (Kanban column) label Dec 21, 2018
@wjwwood wjwwood merged commit 712f903 into ros2 Dec 21, 2018
@wjwwood wjwwood deleted the revert-297-bugfix/visibility_followup_for_marker branch December 21, 2018 22:20
@wjwwood wjwwood removed the in progress Actively being worked on (Kanban column) label Dec 21, 2018
@wjwwood
Copy link
Member Author

wjwwood commented Dec 21, 2018

Oh crap, this reverted #366 too... Let me fix that.

@wjwwood
Copy link
Member Author

wjwwood commented Dec 21, 2018

Actually it doesn't look like it did revert it... I'm very confused by the commit message, but I think it's ok. Here's CI of master to confirm:

  • Linux Build Status
  • Linux-aarch64 Build Status
  • macOS Build Status
  • Windows Build Status

wjwwood added a commit that referenced this pull request Jan 14, 2019
wjwwood added a commit that referenced this pull request Jan 15, 2019
* Revert "Migrate scalar displays (#367)"

This reverts commit 9f3f3a6.

* Revert "Handle FindEigen3 module's differing definitions (#370)"

This reverts commit 2077b3a.

* Revert "Skip the system directories when looking for OGRE (#371)"

This reverts commit 61de77f.

* Revert "Revert "Visibility followup for marker" (#369)"

This reverts commit 712f903.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant