From: Sage Weil <sage@redhat.com>
Date: Thu, 28 Aug 2014 21:27:12 +0000 (-0700)
Subject: Merge branch 'master' of git://github.com/flaf/ceph
X-Git-Tag: v0.86~183
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9869f665696da4006c5c23f3d2cc7577f59602e0;p=ceph.git

Merge branch 'master' of git://github.com/flaf/ceph

Signed-off-by: Sage Weil <sage@redhat.com>
---

9869f665696da4006c5c23f3d2cc7577f59602e0