]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'ukernel/wip-mdstypes-split'
authorJohn Spray <john.spray@redhat.com>
Mon, 24 Oct 2016 11:02:48 +0000 (12:02 +0100)
committerJohn Spray <john.spray@redhat.com>
Mon, 24 Oct 2016 11:02:48 +0000 (12:02 +0100)
1  2 
src/mds/CDir.h
src/mds/Mutation.h

diff --cc src/mds/CDir.h
index 6ccdfbd8ab0aa1d7f55ecf0bc5716a52ad11c2e3,84876aa3abcf5f5e7eba4cb471dfa708c3dda656..82fecded6c58bffaaf7d298e006a5bf40255f79c
@@@ -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"
  
Simple merge