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

win_status module: handle 12 hour time in uptime #29272

Merged
merged 2 commits into from Dec 1, 2015

Conversation

Projects
None yet
2 participants
@jfindlay
Contributor

jfindlay commented Nov 30, 2015

Fixes #29251.

Show outdated Hide outdated salt/modules/win_status.py Outdated
@jfindlay

This comment has been minimized.

Show comment
Hide comment
@jfindlay

jfindlay Nov 30, 2015

Contributor

@cachedout, done.

Contributor

jfindlay commented Nov 30, 2015

@cachedout, done.

@jfindlay

This comment has been minimized.

Show comment
Hide comment
@jfindlay

jfindlay Nov 30, 2015

Contributor

Go Go Jenkins!

Contributor

jfindlay commented Nov 30, 2015

Go Go Jenkins!

cachedout added a commit that referenced this pull request Dec 1, 2015

Merge pull request #29272 from jfindlay/win_up_time
win_status module: handle 12 hour time in uptime

@cachedout cachedout merged commit 1129ee1 into saltstack:2015.8 Dec 1, 2015

4 of 6 checks passed

jenkins/salt-pr-rs-cent6-n Salt PR - RS CentOS 6 #297 — FAILURE
Details
default Merged build started.
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #11587 — SUCCESS
Details
jenkins/salt-pr-linode-ubuntu14.04-n Salt PR - Linode Ubuntu 14.04 #2654 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #11295 — SUCCESS
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #10122 — SUCCESS
Details

@jfindlay jfindlay deleted the jfindlay:win_up_time branch Dec 1, 2015

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