From: Sage Weil <sage@redhat.com>
Date: Sat, 23 Jun 2018 22:04:46 +0000 (-0500)
Subject: Merge PR #22615 into master
X-Git-Tag: v14.0.1~1034
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dc4e35b523c31581afaa0c8d63a22a3c5d62a5cf;p=ceph.git

Merge PR #22615 into master

* refs/pull/22615/head:
	common: fix enum redeclaration

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
---

dc4e35b523c31581afaa0c8d63a22a3c5d62a5cf