← Back to branch summary

~pedronis/u1db/sync_integration_tests

~pedronis/u1db/sync_integration_tests

Viewing all changes in revision 327.1.11.

Committer: Eric Casteleijn
Date: 2012-06-19 19:36:50 UTC
mfrom: (327.2.3 u1db)
mto: (327.2.5 u1db)
mto: This revision was merged to the branch mainline in revision 335.
Revision ID: eric.casteleijn@canonical.com-20120619193650-rxd5hm68pmgxc06y

merged trunk resolved conflicts

files modified:
src/u1db.c

u1db/backends/__init__.py

u1db/backends/inmemory.py

u1db/backends/sqlite_backend.py

u1db/tests/test_backends.py

u1db/tests/test_sync.py

Show diffs side-by-side

added added

removed removed

u1db/backends/__init__.py

u1db/backends/inmemory.py

u1db/backends/sqlite_backend.py

u1db/tests/test_backends.py

u1db/tests/test_sync.py

Older »