]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #8464 from dzafman/wip-13039-15315
authorNathan Cutler <presnypreklad@gmail.com>
Fri, 29 Jul 2016 07:36:05 +0000 (09:36 +0200)
committerGitHub <noreply@github.com>
Fri, 29 Jul 2016 07:36:05 +0000 (09:36 +0200)
commit76fa3b1097b3711ef75bd36aa2a4074e7a8fa9e6
tree72bde972d4da4af6363254c4f1e29113c8c7ee7e
parentcf5f1117afe9e03c683fd40e5af964eaf5975e2b
parentca0beef84812b09f1ab224e4796fd44c8fe37989
Merge pull request #8464 from dzafman/wip-13039-15315

hammer: "FAILED assert(pg->info.history.same_interval_since == p.same_interval_since)" in upgrade:hammer-x-jewel-distro-basic-openstack

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
src/osd/OSD.cc
src/osd/PG.cc