]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #27696 into master
authorSage Weil <sage@redhat.com>
Wed, 24 Apr 2019 13:15:19 +0000 (08:15 -0500)
committerSage Weil <sage@redhat.com>
Wed, 24 Apr 2019 13:15:19 +0000 (08:15 -0500)
* refs/pull/27696/head:
osd: make use of pg history and past_intervals in pg_create2 messages
mon/OSDMonitor: track history and past_intervals for creating pgs
osd/osd_types: make PastIntervals pi_compact_rep print participants
osd/osd_types: take bare const OSDMap * to check_new_interval
osd/osd_types: add pg_history_t ctor that takes creation epoch+stamp

Reviewed-by: Neha Ojha <nojha@redhat.com>
1  2 
src/mon/OSDMonitor.cc
src/osd/PG.cc

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