From: Josh Durgin <josh.durgin@inktank.com>
Date: Thu, 30 Aug 2012 23:06:37 +0000 (-0700)
Subject: Merge branch 'wip-rbd-children'
X-Git-Tag: v0.53~235
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=82999c0e492e1f6e8fd53d189e461bf2c4328c00;p=ceph.git

Merge branch 'wip-rbd-children'
---

82999c0e492e1f6e8fd53d189e461bf2c4328c00