]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #14648 from gregsfortytwo/wip-17916-master
authorSage Weil <sage@newdream.net>
Fri, 21 Apr 2017 13:37:18 +0000 (08:37 -0500)
committerGitHub <noreply@github.com>
Fri, 21 Apr 2017 13:37:18 +0000 (08:37 -0500)
commit4c1d59c549cc7d34cc808c28344ae62dfc0ccc2a
tree30780f1a7ac8084788fd77d03e037bcc0e212741
parentdee4f31cabb1399b6c8d23a2c442387382669780
parent3a4d5ec81bfe5f42c134f0685118f238c64aa614
Merge pull request #14648 from gregsfortytwo/wip-17916-master

osd: pglog: with config, don't assert in the presence of stale diverg…

Reviewed-by: Sage Weil <sage@redhat.com>
src/common/config_opts.h