]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #14596 from gregsfortytwo/wip-17916-divergent
authorGregory Farnum <greg@gregs42.com>
Wed, 19 Apr 2017 06:47:27 +0000 (02:47 -0400)
committerGitHub <noreply@github.com>
Wed, 19 Apr 2017 06:47:27 +0000 (02:47 -0400)
commit6dcd5fa8474c3a43ffca2394557b11f4906ee1ff
tree88b973980c640fd1588b70fda964c67d8e537085
parent7c006fc1640d2f6b9dc9002bfd994ecdf25510ee
parent68fcb01211e064f0d200cc9c9576254e9a6b949c
Merge pull request #14596 from gregsfortytwo/wip-17916-divergent

Wip 17916 divergent

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
src/common/config_opts.h
src/osd/PG.cc
src/osd/PGLog.cc
src/tools/ceph_objectstore_tool.cc