]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-librbd-snaps-object-map' into hammer
authorJosh Durgin <jdurgin@redhat.com>
Mon, 16 Feb 2015 22:27:44 +0000 (14:27 -0800)
committerJosh Durgin <jdurgin@redhat.com>
Mon, 16 Feb 2015 22:27:44 +0000 (14:27 -0800)
Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Trivial merge