Merge pull request #6577 from Icinga/fix/setup-api-including-users-file

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

Mon, 11 Feb 2019 15:41:46 +0000 (16:41 +0100)

committer GitHub <noreply@github.com>

Mon, 11 Feb 2019 15:41:46 +0000 (16:41 +0100)
author Michael Friedrich <michael.friedrich@icinga.com>
Mon, 11 Feb 2019 15:41:46 +0000 (16:41 +0100)
committer GitHub <noreply@github.com>
Mon, 11 Feb 2019 15:41:46 +0000 (16:41 +0100)
diff --cc lib/cli/apisetuputility.cpp
Simple merge
diff --cc lib/cli/nodeutility.cpp
Simple merge
diff --cc lib/cli/nodeutility.hpp
Simple merge
author	Michael Friedrich <michael.friedrich@icinga.com>
	Mon, 11 Feb 2019 15:41:46 +0000 (16:41 +0100)
committer	GitHub <noreply@github.com>
	Mon, 11 Feb 2019 15:41:46 +0000 (16:41 +0100)
		1	2
lib/cli/apisetuputility.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
lib/cli/nodeutility.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
lib/cli/nodeutility.hpp	patch \|	diff1 \|	diff2 \|	blob \| history