r11331: add conflict cases owned,released vs. replica
authorStefan Metzmacher <metze@samba.org>
Thu, 27 Oct 2005 13:12:35 +0000 (13:12 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 18:45:20 +0000 (13:45 -0500)
commitb323a81b7c46740a5abc91e382deaa7ab92bef3b
tree67ed0639f4dc5c2afa206376f9b77d422951a635
parent7ec41c942458d85fc439d3608115428d15257544
r11331: add conflict cases owned,released vs. replica

metze
(This used to be commit d3049936a574e35eb00f072a3c378db0b69170aa)
source4/wrepl_server/wrepl_apply_records.c