From: Gregory Meno <gmeno@redhat.com>
Date: Fri, 21 Apr 2017 23:39:39 +0000 (-0700)
Subject: Merge branch 'master' into wip-bz-mill
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a26977764c7a5ef2aa001cca6edc932dfd139dae;p=ceph-build.git

Merge branch 'master' into wip-bz-mill
---

a26977764c7a5ef2aa001cca6edc932dfd139dae