]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #23223 into master
authorSage Weil <sage@redhat.com>
Wed, 1 Aug 2018 01:16:30 +0000 (20:16 -0500)
committerSage Weil <sage@redhat.com>
Wed, 1 Aug 2018 01:16:30 +0000 (20:16 -0500)
* refs/pull/23223/head:
osd/PG: kill dead functions and related options
iosd/osd_type: kill unused input ec_pool for iterate_mayberw_back_to
common: kill dead options
osd/PG: do not initialize up/acting twice
osd/PG: clear missing_loc properly if last location is gone

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/common/legacy_config_opts.h
src/common/options.cc
src/osd/PG.cc
src/osd/PG.h

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