]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #9307 from cxwshawn/wip-tc7-fix
authorSage Weil <sage@newdream.net>
Wed, 24 May 2017 02:49:46 +0000 (21:49 -0500)
committerGitHub <noreply@github.com>
Wed, 24 May 2017 02:49:46 +0000 (21:49 -0500)
crush: optimize header file dependency

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
1  2 
src/crush/CrushCompiler.cc
src/crush/CrushCompiler.h
src/crush/CrushLocation.cc
src/crush/CrushTester.cc

Simple merge
Simple merge
index c7e78f1caa564b112216c3aef42f156fd231b0b2,0ff481e2d20b6f497129c574e6de66c94b93aab6..4831616c0cb3ab81cb7987b33763ebbca6be4705
@@@ -7,9 -6,8 +7,9 @@@
  #include "common/config.h"
  #include "include/str_list.h"
  #include "common/debug.h"
 +#include "include/compat.h"
  
- #include <common/SubProcess.h>
+ #include "common/SubProcess.h"
  
  #include <vector>
  
Simple merge