diff options
| author | Stefan Metzmacher <metze@samba.org> | 2005-10-19 09:41:54 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:44:56 -0500 |
| commit | 50030d5c4fe70de7defa2b513664f83d9ccd47c9 (patch) | |
| tree | af385573405690c233717a5d4ea4b4a11ef4ca14 /COPYING | |
| parent | e8118ad3b0505534d68ccbef7a2cff54a9705ebb (diff) | |
| download | samba-50030d5c4fe70de7defa2b513664f83d9ccd47c9.tar.gz samba-50030d5c4fe70de7defa2b513664f83d9ccd47c9.tar.bz2 samba-50030d5c4fe70de7defa2b513664f83d9ccd47c9.zip | |
r11178: add some logic functions for the replica_vs_replica conflict handling
to our winsrepl server, but it handles only the simple cases (without merging)
and we still didn't apply records to our wins.ldb, we just print out what we would do
metze
(This used to be commit e4edeeaa0a808c6bcdf022eec1257e796c1c0700)
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions