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

Additions for antidote db #1

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

Additions for antidote db #1

wants to merge 8 commits into from

Commits on Aug 24, 2016

  1. added operations and snapshots types needed for Antidote DB

    @santialvarezcolombo
    santialvarezcolombo committed Aug 24, 2016
    Configuration menu
    Copy the full SHA
    5678a4a View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2016

  1. Merge branch 'master' of https://github.com/SyncFree/antidote_utils i… 

    …nto additions_for_antidote_db

* 'master' of https://github.com/SyncFree/antidote_utils:
  more precise dcid definition
    @santialvarezcolombo
    santialvarezcolombo committed Aug 26, 2016
    Configuration menu
    Copy the full SHA
    d0f6d26 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2016

  1. Added the log_record, which will be used as the new value 

    stored by antidoteDB.
    @santialvarezcolombo
    santialvarezcolombo committed Sep 7, 2016
    Configuration menu
    Copy the full SHA
    288d86a View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2016

  1. Updated snapshot record

    @santialvarezcolombo
    santialvarezcolombo committed Sep 21, 2016
    Configuration menu
    Copy the full SHA
    9ff2d42 View commit details
    Browse the repository at this point in the history

  2. Updated snapshot record

    @santialvarezcolombo
    santialvarezcolombo committed Sep 21, 2016
    Configuration menu
    Copy the full SHA
    70363a9 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'additions_for_antidote_db' of https://github.com/SyncFr… 

    …ee/antidote_utils into additions_for_antidote_db

* 'additions_for_antidote_db' of https://github.com/SyncFree/antidote_utils:
  Updated snapshot record
    @santialvarezcolombo
    santialvarezcolombo committed Sep 21, 2016
    Configuration menu
    Copy the full SHA
    20e34c3 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2016

  1. Merge branch 'vectorclock-renaming' of https://github.com/SyncFree/an… 

    …tidote_utils into additions_for_antidote_db

* 'vectorclock-renaming' of https://github.com/SyncFree/antidote_utils:
  renamed vectorclock functions strict_ge to gt and strict_le to lt
  renamed vectorclock functions
    @santialvarezcolombo
    santialvarezcolombo committed Oct 21, 2016
    Configuration menu
    Copy the full SHA
    7fd4b84 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2016

  1. Merge branch 'master' into additions_for_antidote_db 

    # Conflicts:
#	include/antidote_utils.hrl
    @bieniusa
    bieniusa committed Oct 30, 2016
    Configuration menu
    Copy the full SHA
    fba023f View commit details
    Browse the repository at this point in the history