This is an automated email from the git hooks/post-receive script.
lkrispen pushed a change to branch master
in repository 389-ds-base.
from 5d82589 Issue 49371 - Fix rpm build
new f63949d Ticket 49043 - make replication conflicts transparent to clients
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
Makefile.am | 1 +
ldap/schema/02common.ldif | 1 +
ldap/servers/plugins/replication/repl5.h | 2 +
ldap/servers/plugins/replication/repl5_init.c | 58 +-
ldap/servers/plugins/replication/repl5_plugins.c | 70 +-
ldap/servers/plugins/replication/repl5_ruv.c | 4 +-
ldap/servers/plugins/replication/urp.c | 1193 +++++++++++++++++++---
ldap/servers/plugins/replication/urp.h | 6 +
ldap/servers/plugins/replication/urp_glue.c | 2 +-
ldap/servers/plugins/replication/urp_tombstone.c | 205 ++++
ldap/servers/plugins/retrocl/retrocl_po.c | 3 +-
ldap/servers/slapd/back-ldbm/ldbm_add.c | 174 +++-
ldap/servers/slapd/back-ldbm/ldbm_delete.c | 184 ++--
ldap/servers/slapd/back-ldbm/ldbm_modify.c | 11 +-
ldap/servers/slapd/back-ldbm/ldbm_modrdn.c | 17 +-
ldap/servers/slapd/libmakefile | 2 +-
ldap/servers/slapd/pblock.c | 26 +
ldap/servers/slapd/pblock_v3.h | 1 +
ldap/servers/slapd/plugin.c | 5 +
ldap/servers/slapd/plugin_mmr.c | 71 ++
ldap/servers/slapd/proto-slap.h | 6 +
ldap/servers/slapd/slap.h | 11 +-
ldap/servers/slapd/slapi-plugin.h | 13 +
ldap/servers/slapd/slapi-private.h | 2 +
24 files changed, 1771 insertions(+), 297 deletions(-)
create mode 100644 ldap/servers/slapd/plugin_mmr.c
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.