]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #27220 into nautilus
authorSage Weil <sage@redhat.com>
Tue, 2 Apr 2019 01:52:46 +0000 (20:52 -0500)
committerSage Weil <sage@redhat.com>
Tue, 2 Apr 2019 01:52:46 +0000 (20:52 -0500)
* refs/pull/27220/head:
osd/PG: move '}' to the proper place
doc: Document new pg state and changes to auto repair behavior
osd, test: Add num_shards_repaired to osd_stat_t for pushes with repair set 3(3)
osd: Track num_objects_repaired in pg stats 2(3)
test, osd: Improvements to auto_repair 1(3)
test: osd-scrub-repair.sh: use corrupt_and_repair_lrc for lrc tests
osd: Publish stats after all changes made
osd: Fixes for 64-bit PG state

Reviewed-by: Neha Ojha <nojha@redhat.com>

Trivial merge