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

Fix diskusage beacon #34103

Merged
merged 1 commit into from
Jun 21, 2016
Merged

Fix diskusage beacon #34103

merged 1 commit into from
Jun 21, 2016

Conversation

morganwillcock
Copy link
Contributor

@morganwillcock morganwillcock commented Jun 17, 2016

What does this PR do?

This fixes the diskusage beacon, which looks to have been broken by #33474 ("TypeError: must be string, not dict" when try to check a mount point). This effectively reverts #33474.

What issues does this PR fix or reference?

#33972

Tests written?

No

Stop trying to load the entire mount dict as the mount point.
@rallytime
Copy link
Contributor

@cachedout and @garethgreenaway - Can you guys have a look at this in regards to the changes made in #33474? If this fix is correct, then it may need to be backported since the original change was submitted against 2015.8.

@cachedout
Copy link
Contributor

@rallytime Go ahead and backport this.

@cachedout cachedout merged commit 8ac5a30 into saltstack:develop Jun 21, 2016
@rallytime
Copy link
Contributor

@cachedout Ok - done in #34176.

@rallytime rallytime added the ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch. label Jun 21, 2016
cachedout pushed a commit that referenced this pull request Jun 21, 2016
@morganwillcock morganwillcock deleted the fix-diskusage-beacon branch June 21, 2016 22:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants