8000 Floating point type conversion by luhkevin · Pull Request #266 · postmanlabs/httpbin · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Floating point type conversion #266

New issue 8000

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Nov 25, 2015
Merged

Floating point type conversion #266

merged 1 commit into from
Nov 25, 2015

Conversation

luhkevin
Copy link
Contributor

Apologies, but my last pull request, which was merged in 4763d47, was merged with a bug.

Since the int constraint is removed to allow for floats, the delay parameter comes in as unicode.
I'm not exactly sure how the unicode is compared with the integer 10, but this obviously creates undesirable delays -- 10 ends up being smaller than whatever number the min function interprets the unicode as.

I've run this with delay between 1 - 10 and 0 - 1 and they all return 10.

Sorry again for the trouble. Hopefully there won't be any more.

@sigmavirus24
Copy link
Contributor

Can you please remove the extra commits from this? The only one that needs to be here is de877ac. If you need instructions on how to do that, let me know.

@luhkevin
Copy link
Contributor Author

Actually yeah, how do you exactly get rid of the extra commits?

I was fiddling around with the pull request interface and the branch you merged but wasn't able to get it down to just that one commit.

@sigmavirus24
Copy link
Contributor

So take a look at the output of the following:

$ git remote -v

It might look like

origin ... git@github.com:luhkevin/httpbin.git ...
origin ... git@github.com:luhkevin/httpbin.git

So you'll want to then do git remote add upstream https://github.com/Runscope/httpbin and then git remote update. You'll then see something like

origin ... git@github.com:luhkevin/httpbin.git ...
origin ... git@github.com:luhkevin/httpbin.git ...
upstream ... https://github.com/Runscope/httpbin ...
upstream ... https://github.com/Runscope/httpbin ...

Now what you want to do is git checkout master (since you seem to be using a dev branch) and git pull upstream master. Then do git checkout -b pull/266 and git cherry-pick dev (which will grab the last commit on dev). Then you can switch back to dev and do git reset --hard pull/266 and finally git push --force origin HEAD.

In general, you always want to checkout master and do git pull upstream master and then create a new branch each time from master. This will make pull requests cleaner and keep you up-to-date with everything happening on the upstream project.

@luhkevin
Copy link
Contributor Author

Neat, thanks for all the help! I will follow those guidelines the next time I make a pull request.

sigmavirus24 added a commit that referenced this pull request Nov 25, 2015
@sigmavirus24
Merge pull request #266 from luhkevin/dev
6cdc1fb 
Floating point type conversion
@sigmavirus24 sigmavirus24 merged commit 6cdc1fb into postmanlabs:master Nov 25, 2015
@sigmavirus24
Copy link
Contributor

Thanks @luhkevin for fixing up your PR and this bug. =D

@johnsheehan
Copy link
Contributor

Can you bump the version (0.4.1 is good) and update the changelog too?
Similar to
c688307
Separate
PR is fine. Once that's merged, I'll deploy to httpbin.org

On Wed, Nov 25, 2015 at 8:07 AM, Ian Cordasco notifications@github.com
wrote:

Thanks @luhkevin https://github.com/luhkevin for fixing up your PR and
this bug. =D

—
Reply to this email directly or view it on GitHub
#266 (comment).

@luhkevin luhkevin mentioned this pull request Nov 26, 2015
Merged
@johnsheehan
Copy link
Contributor

Deployed

@luhkevin
Copy link
Contributor Author

Cool!

dimok777 pushed a commit to dimok777/httpbin that referenced this pull request Oct 20, 2017
@sigmavirus24
Merge pull request postmanlabs#266 from luhkevin/dev
613e7b8 
Floating point type conversion
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Proje 44E0 cts
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@luhkevin @sigmavirus24 @johnsheehan
0