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 sleep time option to recognize a numeric argument #771

Merged
merged 2 commits into from
Mar 10, 2016
Merged

Fix sleep time option to recognize a numeric argument #771

merged 2 commits into from
Mar 10, 2016

Conversation

vutny
Copy link
Contributor

@vutny vutny commented Mar 10, 2016

Silly bug, possibly introduced by wrong merge.

@s0undt3ch
Copy link
Member

Oh, you been bumping the date. That's usually only right before merging to stable, but that's alright...

@s0undt3ch
Copy link
Member

Could you take care of this one too since you're at it?

Thanks!

@vutny
Copy link
Contributor Author

vutny commented Mar 10, 2016

@s0undt3ch I've already fixed it in 1b9ea4f. Jenkins triggered job for wrong PR No 766 again, but the first attempt was correct.

@vutny
Copy link
Contributor Author

vutny commented Mar 10, 2016

Regarding the version bump, I thought that develop branch went far away from stable currently, and there is no way to determine the exact commit from bug reports...
Especially when people use curl -L https://bootstrap.saltstack.com/develop ....

@s0undt3ch
Copy link
Member

The only way to determine is the -dev in the end. If the version of stable and develop match, develop is more recent because of that suffix...

s0undt3ch added a commit that referenced this pull request Mar 10, 2016
Fix sleep time option to recognize a numeric argument
@s0undt3ch s0undt3ch merged commit b5be6fe into saltstack:develop Mar 10, 2016
@vutny
Copy link
Contributor Author

vutny commented Mar 10, 2016

@s0undt3ch Acknowledged, thanks. Will add -dev suffix in further PRs.

@vutny vutny deleted the fix-sleep-option branch March 10, 2016 10:19
@s0undt3ch
Copy link
Member

No no. -dev is added automatically :)

@vutny
Copy link
Contributor Author

vutny commented Mar 10, 2016

@s0undt3ch Strange... I can't find where such thing happen... Maybe you meant this?

 504 echowarn "Running the unstable version of ${__ScriptName}"

This line is commented in stable.

@s0undt3ch
Copy link
Member

Hmm, yes, that's what I was referring to. Sorry.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants