Merge pull request #8732 from pieterlexis/remote-support-getUnfreshSlaveInfos

author Peter van Dijk <peter.van.dijk@powerdns.com>

Tue, 28 Jan 2020 13:56:29 +0000 (14:56 +0100)

committer GitHub <noreply@github.com>

Tue, 28 Jan 2020 13:56:29 +0000 (14:56 +0100)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Tue, 28 Jan 2020 13:56:29 +0000 (14:56 +0100)
committer GitHub <noreply@github.com>
Tue, 28 Jan 2020 13:56:29 +0000 (14:56 +0100)
diff --cc docs/backends/remote.rst
Simple merge
diff --cc modules/remotebackend/httpconnector.cc
Simple merge
diff --cc modules/remotebackend/remotebackend.cc
Simple merge
diff --cc modules/remotebackend/remotebackend.hh
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Tue, 28 Jan 2020 13:56:29 +0000 (14:56 +0100)
committer	GitHub <noreply@github.com>
	Tue, 28 Jan 2020 13:56:29 +0000 (14:56 +0100)
		1	2
docs/backends/remote.rst	patch \|	diff1 \|	diff2 \|	blob \| history
modules/remotebackend/httpconnector.cc	patch \|	diff1 \|	diff2 \|	blob \| history
modules/remotebackend/remotebackend.cc	patch \|	diff1 \|	diff2 \|	blob \| history
modules/remotebackend/remotebackend.hh	patch \|	diff1 \|	diff2 \|	blob \| history