From: John Wilkins <john.wilkins@inktank.com>
Date: Wed, 10 Oct 2012 21:36:13 +0000 (-0700)
Subject: Merge branch 'wip-rbd-openstack-doc'
X-Git-Tag: v0.54~59
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8f07729ad12f6d488c73ce5f3c18696734657a79;p=ceph.git

Merge branch 'wip-rbd-openstack-doc'
---

8f07729ad12f6d488c73ce5f3c18696734657a79