From: Yehuda Sadeh <yehuda@inktank.com>
Date: Wed, 30 Oct 2013 23:56:46 +0000 (-0700)
Subject: Merge pull request #766 from kri5/wip-5374
X-Git-Tag: v0.74~93
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b20d1bf33bdf6ed25ef9bb37afc3890282ece6d4;p=ceph.git

Merge pull request #766 from kri5/wip-5374

Rebase of Wip 5374 against master

Reviewed-by: Yehuda Sadeh <yehdua@inktank.com>
---

b20d1bf33bdf6ed25ef9bb37afc3890282ece6d4