Merge pull request #6509 from gunnarbeutner/feature/real-constants

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

Fri, 24 Aug 2018 10:10:10 +0000 (12:10 +0200)

committer GitHub <noreply@github.com>

Fri, 24 Aug 2018 10:10:10 +0000 (12:10 +0200)
author Michael Friedrich <michael.friedrich@icinga.com>
Fri, 24 Aug 2018 10:10:10 +0000 (12:10 +0200)
committer GitHub <noreply@github.com>
Fri, 24 Aug 2018 10:10:10 +0000 (12:10 +0200)
diff --cc doc/16-upgrading-icinga-2.md
Simple merge
diff --cc lib/remote/apilistener.cpp
Simple merge
author	Michael Friedrich <michael.friedrich@icinga.com>
	Fri, 24 Aug 2018 10:10:10 +0000 (12:10 +0200)
committer	GitHub <noreply@github.com>
	Fri, 24 Aug 2018 10:10:10 +0000 (12:10 +0200)
		1	2
doc/16-upgrading-icinga-2.md	patch \|	diff1 \|	diff2 \|	blob \| history
lib/remote/apilistener.cpp	patch \|	diff1 \|	diff2 \|	blob \| history