From: John Spray <john.spray@redhat.com>
Date: Mon, 24 Oct 2016 11:02:48 +0000 (+0100)
Subject: Merge remote-tracking branch 'ukernel/wip-mdstypes-split'
X-Git-Tag: v11.1.0~534
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4f09892a84da6603fdc42825fcf8c11359c1cc29;p=ceph.git

Merge remote-tracking branch 'ukernel/wip-mdstypes-split'
---

4f09892a84da6603fdc42825fcf8c11359c1cc29
diff --cc src/mds/CDir.h
index 6ccdfbd8ab0a,84876aa3abcf..82fecded6c58
--- a/src/mds/CDir.h
+++ b/src/mds/CDir.h
@@@ -19,8 -19,6 +19,7 @@@
  
  #include "include/types.h"
  #include "include/buffer_fwd.h"
- #include "mdstypes.h"
 +#include "common/bloom_filter.hpp"
  #include "common/config.h"
  #include "common/DecayCounter.h"