]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-rbd-openstack-doc'
authorJohn Wilkins <john.wilkins@inktank.com>
Wed, 10 Oct 2012 21:36:13 +0000 (14:36 -0700)
committerJohn Wilkins <john.wilkins@inktank.com>
Wed, 10 Oct 2012 21:36:13 +0000 (14:36 -0700)

Trivial merge