From: Gregory Farnum <greg@gregs42.com>
Date: Wed, 19 Apr 2017 06:47:27 +0000 (-0400)
Subject: Merge pull request #14596 from gregsfortytwo/wip-17916-divergent
X-Git-Tag: v10.2.8~95
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6dcd5fa8474c3a43ffca2394557b11f4906ee1ff;p=ceph.git

Merge pull request #14596 from gregsfortytwo/wip-17916-divergent

Wip 17916 divergent

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

6dcd5fa8474c3a43ffca2394557b11f4906ee1ff