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

do not crash if ENV in CONF is None #3528

Merged
merged 2 commits into from
Sep 25, 2017
Merged

Conversation

CharlyF
Copy link
Contributor

@CharlyF CharlyF commented Sep 20, 2017

What does this PR do?

If envvar is NoneType, we want to return the tags directly instead of crashing.

Motivation

Support case brought up by the community.

Testing Guidelines

Set up a DCOS cluster v 1.9.2, deployed the agent running 5.17.2 and witnessed the successful auto discovery of a redis container along with the collection of Mesos/Marathon specific tags.

@alexcristi
Copy link

👍

Copy link
Contributor

@xvello xvello left a comment

Choose a reason for hiding this comment

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

LGTM

@CharlyF CharlyF merged commit 2f9a7ba into master Sep 25, 2017
@CharlyF CharlyF deleted the charly/mesosutil_envvar_fix branch September 25, 2017 15:46
@truthbk truthbk added this to the 5.18.0 milestone Oct 2, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants