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

fixed: uptime now working on non-US Windows #29924

Merged
merged 2 commits into from Dec 22, 2015

Conversation

Projects
None yet
2 participants
@gqgunhed
Contributor

gqgunhed commented Dec 22, 2015

  1. works independent from Windows OS language setting
    uptime now uses "wmic os get lastbootuptime" which returns just the time.
    The former matching relied on matching English text and time format.
  2. datetime.now() changed to datetime.datetime.now()

gqgunhed added some commits Dec 22, 2015

fixed: uptime now working on non-US Windows
1. works independent from Windows OS language setting
uptime now uses "wmic os get lastbootuptime" which returns just the time.
The former matching relied on matching English text and time format.

2. datetime.now() changed to datetime.datetime.now()
removed duplicate datetime line
copy/paste error

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

Merge pull request #29924 from gqgunhed/gqgunhed-2015.8
fixed: uptime now working on non-US Windows

@cachedout cachedout merged commit 02ed5b8 into saltstack:2015.8 Dec 22, 2015

4 of 5 checks passed

default Merged build finished.
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #12266 — SUCCESS
Details
jenkins/salt-pr-linode-ubuntu14.04-n Salt PR - Linode Ubuntu 14.04 #3330 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #11968 — SUCCESS
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #10845 — SUCCESS
Details

@gqgunhed gqgunhed deleted the gqgunhed:gqgunhed-2015.8 branch Dec 28, 2015

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