From: Greg Farnum <gfarnum@redhat.com>
Date: Fri, 11 Mar 2016 17:21:24 +0000 (-0800)
Subject: Merge branch 'master' into jewel
X-Git-Tag: v11.1.1~58^2^2~302^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=74294039a3f5fd9f681f4913e243af3f962abeaf;p=ceph-ci.git

Merge branch 'master' into jewel
---

74294039a3f5fd9f681f4913e243af3f962abeaf