From: Sage Weil <sage@newdream.net>
Date: Wed, 24 May 2017 02:49:46 +0000 (-0500)
Subject: Merge pull request #9307 from cxwshawn/wip-tc7-fix
X-Git-Tag: v12.1.0~10^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0aa04f523be2b18ea5419f8a7e666cafb827e370;p=ceph.git

Merge pull request #9307 from cxwshawn/wip-tc7-fix

crush: optimize header file dependency

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
---

0aa04f523be2b18ea5419f8a7e666cafb827e370
diff --cc src/crush/CrushLocation.cc
index c7e78f1caa5,0ff481e2d20..4831616c0cb
--- a/src/crush/CrushLocation.cc
+++ b/src/crush/CrushLocation.cc
@@@ -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>