]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #5121 from theanalyst/wip-11983-hammer
authorSage Weil <sage@redhat.com>
Fri, 31 Jul 2015 19:18:52 +0000 (15:18 -0400)
committerSage Weil <sage@redhat.com>
Fri, 31 Jul 2015 19:18:52 +0000 (15:18 -0400)
FAILED assert(!old_value.deleted()) in upgrade:giant-x-hammer-distro-basic-multi run

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/ReplicatedPG.cc

Simple merge