]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #10334 from ceph/wip-ec-pg-log
authorJosh Durgin <jdurgin@redhat.com>
Fri, 22 Jul 2016 21:27:19 +0000 (14:27 -0700)
committerGitHub <noreply@github.com>
Fri, 22 Jul 2016 21:27:19 +0000 (14:27 -0700)
osd: persist the missing set explicitly

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/common/config_opts.h
src/osd/OSD.cc
src/osd/PG.cc
src/osd/ReplicatedBackend.cc
src/osd/ReplicatedPG.cc

Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
Simple merge
Simple merge