Do not remember sorry :(
Small conflict solved
Merge branch 'clock-SI' of https://github.com/SyncFree/floppystore into clock-SI
Merge branch 'clock-SI' of https://github.com/SyncFree/floppystore into clock-SI
diff in dev*_vars.config
Merge branch 'clock-SI' of https://github.com/SyncFree/floppystore into partitioned_log
Merge branch 'partitioned_log' into clock-SI
Merge branch 'clock-SI' of https://github.com/SyncFree/floppystore into clock-SI
6 nodes into the Makefile