summaryrefslogtreecommitdiff
path: root/source4/lib/socket
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-01-13 11:17:27 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:40:32 -0500
commit2cf643929ce9024bcdad7ef52bcfce6e97677996 (patch)
tree7aea1e97fa966272b2d462739a0bb9f4d43b97d5 /source4/lib/socket
parent7ff19c935de67089f7a807bafb1f6e206ff6c585 (diff)
downloadsamba-2cf643929ce9024bcdad7ef52bcfce6e97677996.tar.gz
samba-2cf643929ce9024bcdad7ef52bcfce6e97677996.tar.bz2
samba-2cf643929ce9024bcdad7ef52bcfce6e97677996.zip
r20727: implement basic merging of replicated objects when it already exist
in the ldb metze (This used to be commit 262e42123d0bca77560fbb5a33c13a9c275ba3ec)
Diffstat (limited to 'source4/lib/socket')
0 files changed, 0 insertions, 0 deletions