From: Sage Weil <sage@redhat.com>
Date: Fri, 16 Dec 2016 23:38:32 +0000 (-0600)
Subject: Merge branch 'master' into wip-remove-unused-class-declaration
X-Git-Tag: v11.1.1~33^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F12466%2Fhead;p=ceph.git

Merge branch 'master' into wip-remove-unused-class-declaration
---

2c7c27ab6cae9e3580fffd6d98f8b0bc7f6e625e
diff --cc src/osd/OSD.h
index 283161cccdb,3c8fac9788b..c1850ee813f
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@@ -212,7 -214,8 +213,7 @@@ class MOSDPGMissing
  class Objecter;
  
  class Watch;
- class ReplicatedPG;
 -class Notification;
+ class PrimaryLogPG;
  
  class AuthAuthorizeHandlerRegistry;