Merge pull request #7211 from Icinga/feature/asio-tls-version

author Michael Friedrich <michael.friedrich@icinga.com>

Mon, 3 Jun 2019 14:19:22 +0000 (16:19 +0200)

committer GitHub <noreply@github.com>

Mon, 3 Jun 2019 14:19:22 +0000 (16:19 +0200)
author Michael Friedrich <michael.friedrich@icinga.com>
Mon, 3 Jun 2019 14:19:22 +0000 (16:19 +0200)
committer GitHub <noreply@github.com>
Mon, 3 Jun 2019 14:19:22 +0000 (16:19 +0200)
diff --cc doc/16-upgrading-icinga-2.md
Simple merge
diff --cc lib/base/tlsutility.cpp
Simple merge
diff --cc lib/remote/apilistener.cpp
Simple merge
author	Michael Friedrich <michael.friedrich@icinga.com>
	Mon, 3 Jun 2019 14:19:22 +0000 (16:19 +0200)
committer	GitHub <noreply@github.com>
	Mon, 3 Jun 2019 14:19:22 +0000 (16:19 +0200)
		1	2
doc/16-upgrading-icinga-2.md	patch \|	diff1 \|	diff2 \|	blob \| history
lib/base/tlsutility.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
lib/remote/apilistener.cpp	patch \|	diff1 \|	diff2 \|	blob \| history