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

Adjust get_time function for salt api #13251

Closed
wants to merge 1 commit into from

Conversation

pengyao
Copy link
Contributor

@pengyao pengyao commented Jun 5, 2014

Timeout is unicode type in salt rest api by POST data.
The issue in salt-api: vmware-archive/salt-api#148

Timeout is unicode type in salt rest api by POST data.
The issue in salt-api: vmware-archive/salt-api#148
@ghost
Copy link

ghost commented Jun 5, 2014

Test Failed.

If the failures are unrelated to your code, don't stress, a core developer will know these apart.
In the future, if possible, please branch off a passing commit to avoid false positives.
Refer to this link for build results: http://jenkins.saltstack.com/job/salt-pr-build/4870/

@thatch45
Copy link
Contributor

thatch45 commented Jun 5, 2014

@pengyao, this has merge conflicts, can you please rebase?

@pengyao
Copy link
Contributor Author

pengyao commented Jun 5, 2014

@thatch45 oh, basestring contain str and unicode . It fixed #13253 perfect than me. I'll close this issue.

@pengyao pengyao closed this Jun 5, 2014
@pengyao pengyao deleted the timeout_salt_api branch June 5, 2014 22:38
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.

2 participants