]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'rbd-map-options'
authorJosh Durgin <josh.durgin@inktank.com>
Fri, 27 Dec 2013 17:56:55 +0000 (09:56 -0800)
committerJosh Durgin <josh.durgin@inktank.com>
Fri, 27 Dec 2013 17:56:55 +0000 (09:56 -0800)
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

Trivial merge