]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #5420 from ceph/wip-12429
authorKefu Chai <tchaikov@gmail.com>
Tue, 4 Aug 2015 05:52:15 +0000 (13:52 +0800)
committerKefu Chai <tchaikov@gmail.com>
Tue, 4 Aug 2015 05:52:15 +0000 (13:52 +0800)
osd/OSDMap: handle incrementals that modify+del pool

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Trivial merge