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

READY: Add various socket timeouts #270

Merged
merged 11 commits into from
Jun 9, 2016

Conversation

lukebakken
Copy link
Contributor

@lukebakken lukebakken commented Jun 8, 2016

Fixes #91 (CLIENTS-624)
Supercedes #265 (CLIENTS-859)

@@ -41,6 +41,7 @@
expect(client.nodes.first.host).to eq("riak1.basho.com")
end

<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops 😉

@christophermancini
Copy link
Contributor

👍 Code looks as good as Ruby code can be. Test looks adequate and I see they are passing.

@lukebakken lukebakken merged commit 7435e4c into master Jun 9, 2016
@lukebakken lukebakken deleted the features/lrb/add-timeouts-gh-91 branch June 9, 2016 17:18
@boosty
Copy link
Contributor

boosty commented Jun 10, 2016

Thanks for merging and improving the tests! 👍

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.

4 participants