git.samba.org / sfrench / samba-autobuild / .git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b28d8d4) | patch
dsdb: Use replmd_replPropertyMetaData1_new_should_be_taken in replmd_replicated_apply...
authorAndrew Bartlett <abartlet@samba.org>
Tue, 3 May 2016 22:42:05 +0000 (10:42 +1200)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 7 Jun 2016 08:28:10 +0000 (10:28 +0200)
commitf0aa1d8b8074deebc186243a4813c528cd73869d
tree06c3942b27e441323d21928393d94f98a191a802tree
parentb28d8d42783bad1415afdca01dd9c70e092d7360commit | diff
dsdb: Use replmd_replPropertyMetaData1_new_should_be_taken in replmd_replicated_apply_merge()

This is the main handler for attribute conflicts

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz
source4/dsdb/samdb/ldb_modules/repl_meta_data.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.