From: Sage Weil <sage@newdream.net>
Date: Sun, 10 Sep 2017 18:59:45 +0000 (-0500)
Subject: Merge pull request #17496 from smithfarm/wip-21236-luminous
X-Git-Tag: v12.2.1~72
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6957c220edc5c1bab7d41fa0d3ca06f02ec268d5;p=ceph.git

Merge pull request #17496 from smithfarm/wip-21236-luminous

luminous: osd: build_initial_pg_history doesn't update up/acting/etc
---

6957c220edc5c1bab7d41fa0d3ca06f02ec268d5