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.

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

Rebased push of riak_kv#807 (put_merge refactor + EQC) #835

Merged
merged 2 commits into from Feb 13, 2014
Merged

Rebased push of riak_kv#807 (put_merge refactor + EQC) #835

merged 2 commits into from Feb 13, 2014

Commits on Feb 12, 2014

  1. A statem eqc test for ro:merge that uses DVVSet for a model 

    Add copious comments and a command for stale puts
    @russelldb
    russelldb committed Feb 12, 2014
    Copy the full SHA
    249f756 View commit details
    Browse the repository at this point in the history

  2. Move put merge code inside riak_object 

    Since the put_merge code was copied into two tests, both of which
only manipulate riak_object, it seemed a refactor made sense.

Looking at the put merge code, it only manipulates internal state
of riak_object, so I think it is the correct place for the code.

It also smooths the way for a general refactor of riak_object
into a CRDT and riak_kv into riak_crdt (mwah ha ha ha ha!)
    @russelldb
    russelldb committed Feb 12, 2014
    Copy the full SHA
    47079ec View commit details
    Browse the repository at this point in the history