From: Josh Durgin Date: Fri, 27 Dec 2013 17:56:55 +0000 (-0800) Subject: Merge branch 'rbd-map-options' X-Git-Tag: v0.75~27 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9c068939c46190b05f772dc4a2d34c3438d3e10c;p=ceph.git Merge branch 'rbd-map-options' Reviewed-by: Josh Durgin --- 9c068939c46190b05f772dc4a2d34c3438d3e10c