Merge pull request #23111 from smithfarm/wip-18163-mimic

author Yuri Weinstein <yweinste@redhat.com>

Tue, 28 Aug 2018 19:54:07 +0000 (12:54 -0700)

committer GitHub <noreply@github.com>

Tue, 28 Aug 2018 19:54:07 +0000 (12:54 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Tue, 28 Aug 2018 19:54:07 +0000 (12:54 -0700)
committer GitHub <noreply@github.com>
Tue, 28 Aug 2018 19:54:07 +0000 (12:54 -0700)
diff --cc src/ceph-detect-init/ceph_detect_init/__init__.py
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Tue, 28 Aug 2018 19:54:07 +0000 (12:54 -0700)
committer	GitHub <noreply@github.com>
	Tue, 28 Aug 2018 19:54:07 +0000 (12:54 -0700)