]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip_snap_scrub'
authorSamuel Just <sam.just@inktank.com>
Wed, 16 Jan 2013 23:52:53 +0000 (15:52 -0800)
committerSamuel Just <sam.just@inktank.com>
Wed, 16 Jan 2013 23:52:53 +0000 (15:52 -0800)
Reviewed-by: Sage Weil <sage@inktank.com>

Trivial merge