]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #5251 from ceph/wip-12021-next
authorSage Weil <sage@redhat.com>
Thu, 16 Jul 2015 15:05:04 +0000 (11:05 -0400)
committerSage Weil <sage@redhat.com>
Thu, 16 Jul 2015 15:05:04 +0000 (11:05 -0400)
OSDMonitor: allow addition of cache pool with non-empty snaps with co…

Reviewed-by: Sage Weil <sage@redhat.com>

Trivial merge