Merge pull request #6464 from rgacogne/auth-reconnect-pg

author Pieter Lexis <pieterlexis@users.noreply.github.com>

Wed, 11 Apr 2018 09:35:43 +0000 (11:35 +0200)

committer GitHub <noreply@github.com>

Wed, 11 Apr 2018 09:35:43 +0000 (11:35 +0200)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Wed, 11 Apr 2018 09:35:43 +0000 (11:35 +0200)
committer GitHub <noreply@github.com>
Wed, 11 Apr 2018 09:35:43 +0000 (11:35 +0200)
diff --cc modules/gpgsqlbackend/gpgsqlbackend.cc
Simple merge
diff --cc pdns/backends/gsql/gsqlbackend.hh
Simple merge
author	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Wed, 11 Apr 2018 09:35:43 +0000 (11:35 +0200)
committer	GitHub <noreply@github.com>
	Wed, 11 Apr 2018 09:35:43 +0000 (11:35 +0200)
		1	2
modules/gpgsqlbackend/gpgsqlbackend.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/backends/gsql/gsqlbackend.hh	patch \|	diff1 \|	diff2 \|	blob \| history