Merge tag 'samba-4.8.4' into v4-8-test

author Karolin Seeger <kseeger@samba.org>

Tue, 14 Aug 2018 10:16:21 +0000 (12:16 +0200)

committer Karolin Seeger <kseeger@samba.org>

Tue, 14 Aug 2018 10:16:21 +0000 (12:16 +0200)
author Karolin Seeger <kseeger@samba.org>
Tue, 14 Aug 2018 10:16:21 +0000 (12:16 +0200)
committer Karolin Seeger <kseeger@samba.org>
Tue, 14 Aug 2018 10:16:21 +0000 (12:16 +0200)
diff --cc lib/ldb/wscript
Simple merge
diff --cc selftest/knownfail
Simple merge
diff --cc source3/selftest/tests.py
Simple merge
author	Karolin Seeger <kseeger@samba.org>
	Tue, 14 Aug 2018 10:16:21 +0000 (12:16 +0200)
committer	Karolin Seeger <kseeger@samba.org>
	Tue, 14 Aug 2018 10:16:21 +0000 (12:16 +0200)
		1	2
lib/ldb/wscript	patch \|	diff1 \|	diff2 \|	blob \| history
selftest/knownfail	patch \|	diff1 \|	diff2 \|	blob \| history
source3/selftest/tests.py	patch \|	diff1 \|	diff2 \|	blob \| history