git.ipfire.org Git - thirdparty/pdns.git/commit

]> git.ipfire.org Git - thirdparty/pdns.git/commit

projects / thirdparty / pdns.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 684c092 2db1625)

author	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Wed, 14 Nov 2018 08:42:49 +0000 (09:42 +0100)
committer	GitHub <noreply@github.com>
	Wed, 14 Nov 2018 08:42:49 +0000 (09:42 +0100)
commit	479f3c423e45fcced9b47105bc903245515b3004
tree	75d6d106e494dbcad246b573d928cf8697f3528f	tree
parent	684c0920e302990df4f6c985be20476df925f7ad	commit \| diff
parent	2db16252ff7f6d8e00149bc63b2023c84310810d	commit \| diff

Merge pull request #6959 from Gibheer/master

add namespace and instance variable to carbon key

docs/settings.rst	diff1 \|	diff2 \|	blob \| history
pdns/auth-carbon.cc	diff1 \|	diff2 \|	blob \| history
pdns/common_startup.cc	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-carbon.cc	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-lua.cc	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.hh	diff1 \|	diff2 \|	blob \| history
pdns/rec_channel_rec.cc	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/docs/settings.rst	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.