Merge pull request #6194 from Icinga/feature/metric-unit-elastic-gelf

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

Tue, 3 Apr 2018 15:12:29 +0000 (17:12 +0200)

committer GitHub <noreply@github.com>

Tue, 3 Apr 2018 15:12:29 +0000 (17:12 +0200)
author Michael Friedrich <michael.friedrich@icinga.com>
Tue, 3 Apr 2018 15:12:29 +0000 (17:12 +0200)
committer GitHub <noreply@github.com>
Tue, 3 Apr 2018 15:12:29 +0000 (17:12 +0200)
diff --cc lib/perfdata/elasticsearchwriter.cpp
Simple merge
diff --cc lib/perfdata/gelfwriter.cpp
Simple merge
author	Michael Friedrich <michael.friedrich@icinga.com>
	Tue, 3 Apr 2018 15:12:29 +0000 (17:12 +0200)
committer	GitHub <noreply@github.com>
	Tue, 3 Apr 2018 15:12:29 +0000 (17:12 +0200)
		1	2
lib/perfdata/elasticsearchwriter.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
lib/perfdata/gelfwriter.cpp	patch \|	diff1 \|	diff2 \|	blob \| history