From: David Zafman <dzafman@redhat.com>
Date: Thu, 25 Jan 2018 19:44:18 +0000 (-0800)
Subject: Merge branch 'luminous' into wip-22724
X-Git-Tag: v12.2.3~145^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F20055%2Fhead;p=ceph.git

Merge branch 'luminous' into wip-22724
---

80de33b1ca215046290160fcc2781f3b29cb5c35
diff --cc src/osd/PG.h
index 4ea2d0b9ef3f,fb308abba552..8691a273a8a4
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@@ -1886,7 -1872,8 +1902,9 @@@ protected
  	boost::statechart::custom_reaction< AllReplicasActivated >,
  	boost::statechart::custom_reaction< DeferRecovery >,
  	boost::statechart::custom_reaction< DeferBackfill >,
 -	boost::statechart::custom_reaction< UnfoundRecovery >,
 -	boost::statechart::custom_reaction< UnfoundBackfill >
++  boost::statechart::custom_reaction< UnfoundRecovery >,
++	boost::statechart::custom_reaction< UnfoundBackfill >,
 +	boost::statechart::custom_reaction< DoRecovery>
  	> reactions;
        boost::statechart::result react(const QueryState& q);
        boost::statechart::result react(const ActMap&);
@@@ -1904,7 -1891,10 +1922,13 @@@
        boost::statechart::result react(const DeferBackfill& evt) {
  	return discard_event();
        }
+       boost::statechart::result react(const UnfoundRecovery& evt) {
 -	return discard_event();
++  return discard_event();
+       }
+       boost::statechart::result react(const UnfoundBackfill& evt) {
++  return discard_event();
++      }
 +      boost::statechart::result react(const DoRecovery&) {
  	return discard_event();
        }
      };