Olivier Goffart
|
95edd6a9de
|
Merge remote-tracking branch 'origin/master' into dav
Conflicts:
config/ocsync_log.conf
src/csync.c
src/csync.h
src/csync_config.c
src/csync_log.h
src/csync_private.h
src/csync_statedb.c
tests/csync_tests/check_csync_config.c
|
2012-12-03 17:32:08 +01:00 |
|
Klaas Freitag
|
f90550775c
|
Fixed tests to also run on debian host
|
2012-11-23 12:51:01 +01:00 |
|
Klaas Freitag
|
7aeeeae037
|
Fix test, avoid double free.
|
2012-11-09 17:16:27 +01:00 |
|
Andreas Schneider
|
8a0b4319d3
|
csync: Add a new logging system.
|
2012-10-30 11:27:21 +01:00 |
|
Klaas Freitag
|
2bb52ef6f9
|
Merge branch 'master' into dav - get cmocka tests and database move.
Conflicts:
CMakeLists.txt
cmake/Modules/FindCMocka.cmake
src/csync.c
src/csync_exclude.c
src/csync_reconcile.c
src/csync_statedb.c
src/csync_update.c
src/csync_util.c
src/vio/csync_vio.c
tests/CMakeLists.txt
tests/csync_tests/check_csync_exclude.c
tests/csync_tests/check_csync_statedb_load.c
tests/csync_tests/check_csync_statedb_query.c
tests/csync_tests/check_csync_update.c
tests/std_tests/check_std_c_path.c
|
2012-10-27 19:27:14 +02:00 |
|
Klaas Freitag
|
9e4c873b16
|
Fixed csync testcases.
|
2012-10-26 21:33:13 +02:00 |
|
Andreas Schneider
|
aa227aa10b
|
tests: Migrate check_csync_statedb_load to cmocka.
|
2012-10-19 14:43:25 +02:00 |
|
Andreas Schneider
|
e5286c7c8a
|
Rename journal functions to statedb.
|
2008-07-09 10:10:00 +02:00 |
|
Andreas Schneider
|
88690312d7
|
Rename the csync_journal files to csync_statedb.
|
2008-07-09 09:57:19 +02:00 |
|