basho/riak-ruby-client — pull request #192 by bkerley (2014-10-15 22:46:21+00:00)
Title: Add integration specs for conflict resolution

This is a yak shave from the recent docs work