Skip to content

Timeout Parameter #23

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.

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 18 commits into from
Apr 11, 2017
Merged

Timeout Parameter #23

merged 18 commits into from
Apr 11, 2017

Conversation

PandaBoy00
Copy link
Contributor

No description provided.

PandaBoy00 added 16 commits July 11, 2016 15:35
@PandaBoy00
seconds
a01c011
@PandaBoy00
Fixed conflict between MediaType and Timeout properties
f4d73af
@PandaBoy00
Merged MediaType and Timeout properties
c9294dd
@PandaBoy00
Merge branch 'master' of https://github.com/PandaBoy00/csharp-http-cl…
bc1324a 
…ient
@PandaBoy00
Merge conflict for MediaType and Timeout properties
1d38006
@PandaBoy00
Rechecked
322a4c1
@PandaBoy00
Merge branch 'master' of https://github.com/sendgrid/csharp-http-client
83ea184 
Resolved Conflicts
@PandaBoy00
Remove csharp-http-client as it is extra
f4f6596
@PandaBoy00
Added new variable that stores a default value of 10 sec for
cbb6884 
TimeoutDefault
@PandaBoy00
Merge branch 'http-timeout-param' of https://github.com/PandaBoy00/cs…
8b59c70 
…harp-http-client into http-timeout-param

Added new variable that stores a default value of 10 secs for
TimeoutDefault
@PandaBoy00
Reverted .travis.yml to commit 92f16b7
f633ac1
@PandaBoy00
Revert .travis.yml back to commit 92f16b7
2fee721
@PandaBoy00
Merge branch 'http-timeout-param'
548bdb5
@PandaBoy00
Revert back to origin file
c55e2d3
@PandaBoy00
Merge branch 'http-timeout-param' of https://github.com/PandaBoy00/cs…
4b21cce 
…harp-http-client into http-timeout-param
@PandaBoy00
Added TimeoutDefault value to 10 seconds
67d1d7c
@thinkingserious thinkingserious added status: code review request requesting a community code review or review from Twilio status: cla needed labels Mar 23, 2017
@thinkingserious thinkingserious mentioned this pull request Mar 23, 2017
Closed
@thinkingserious
Copy link
Contributor

Thanks @PandaBoy00!

Could you please resolve the remaining conflict?

With Best Regards,

Elmer

@SendGridDX
Copy link

SendGridDX commented Apr 11, 2017 •
edited
Loading

CLA assistant check
Thank you for your submission, we really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
You have signed the CLA already but the status is still pending? Let us recheck it.

@thinkingserious
Copy link
Contributor

Thanks for the update @PandaBoy00,

Looks like there is an error:

Test Error : UnitTest.TestClient.TestMethodCall Microsoft.CSharp.RuntimeBinder.RuntimeBinderException : `SendGrid.CSharp.HTTP.Client.Response' does not contain a definition for `GetAwaiter'

Could you please take a look?

Thanks!

@PandaBoy00
Copy link
Contributor Author

@thinkingserious I have complete the merge and I think I have already signed the CLA. So all should be good now.

@thinkingserious thinkingserious merged commit b1b975c into sendgrid:master Apr 11, 2017
@thinkingserious
Copy link
Contributor

Hello @PandaBoy00,

Thanks again for the PR!

We want to show our appreciation by sending you some swag. Could you please fill out this form so we can send it to you? Thanks!

Team SendGrid DX

thinkingserious added a commit that referenced this pull request Apr 11, 2017
@thinkingserious
Version Bump v3.2.0: #23 Timeout Parameter
d86103a
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
status: code review request requesting a community code review or review from Twilio
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@PandaBoy00 @thinkingserious @SendGridDX