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 parsing disk usage for line with no number and AIX values in Kilos #30160

Merged
merged 1 commit into from Jan 6, 2016

Conversation

Projects
None yet
2 participants
@dmurphy18
Contributor

dmurphy18 commented Jan 5, 2016

Fix for disk usage to handle a line without any digits and to allow for AIX to report Kilobytes
#29770

basepi added a commit that referenced this pull request Jan 6, 2016

Merge pull request #30160 from saltstack/aix_dskusage
Fix parsing disk usage for line with no number and AIX values in Kilos

@basepi basepi merged commit ec009a6 into 2015.8 Jan 6, 2016

2 of 5 checks passed

jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #11095 — ABORTED
Details
jenkins/salt-pr-linode-ubuntu14.04-n Salt PR - Linode Ubuntu 14.04 #3953 — FAILURE
Details
default Merged build started.
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #12508 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #12207 — SUCCESS
Details
@basepi

This comment has been minimized.

Show comment
Hide comment
@basepi

basepi Jan 6, 2016

Collaborator

Good fix. And good job catching the nested continue in the snippet we discussed.

Collaborator

basepi commented Jan 6, 2016

Good fix. And good job catching the nested continue in the snippet we discussed.

@basepi basepi deleted the aix_dskusage branch Jan 6, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment