]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dee4f31 3a4d5ec)
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)
osd: pglog: with config, don't assert in the presence of stale diverg…

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/common/config_opts.h patch | diff1 | diff2 | blob | history

diff --cc src/common/config_opts.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.