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

Gracefully handle conflicts for non-Ripple (riak-client) data #291

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

tpjg
Copy link

@tpjg tpjg commented May 14, 2012

Sorry for another three line pull request. My application is mostly using Ripple, however some data is handled directly using riak-client.
There is no ['_type'] data for documents that are handled with the riak-client only. This small patch allows for conflicting data (allow_mult=true) and resolving it in riak-client only.

Timo Gatsonides added 3 commits May 15, 2012 00:23
There is no ['_type'] data for documents that are handled with the
riak-client only, not Ripple. This allows for conflicting data
(allow_mult=true) and resolving it in riak-client only.
@tpjg
Copy link
Author

tpjg commented Jun 14, 2012

Diff to original is now a single line and not using 'rescue'. It simply checks if the content_type=='application/json' before trying to determine the model.

@jmlacroix
Copy link

The latest patch fixed the problem for me.

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

Successfully merging this pull request may close these issues.

2 participants