]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-recovery-op-warn' into next
authorSamuel Just <sam.just@inktank.com>
Wed, 7 Aug 2013 01:05:06 +0000 (18:05 -0700)
committerSamuel Just <sam.just@inktank.com>
Wed, 7 Aug 2013 01:05:08 +0000 (18:05 -0700)
Reviewed-by: Sage Weil <sage@inktank.com>

Trivial merge