From: Jin Cai <caijin11331007@gmail.com>
Date: Fri, 11 Aug 2017 04:55:16 +0000 (+0800)
Subject: Merge branch 'master' into wip-set-polling-thread-name
X-Git-Tag: v13.0.0~131^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=20725ff88334d8041d88f5538d78dc350b9e896b;p=ceph.git

Merge branch 'master' into wip-set-polling-thread-name
---

20725ff88334d8041d88f5538d78dc350b9e896b
diff --cc src/msg/async/rdma/RDMAStack.cc
index 38e8c897ca4b,4a1961033a3c..dcc6e1a8fb3d
--- a/src/msg/async/rdma/RDMAStack.cc
+++ b/src/msg/async/rdma/RDMAStack.cc
@@@ -19,7 -19,7 +19,8 @@@
  #include <sys/resource.h>
  
  #include "include/str_list.h"
 +#include "include/compat.h"
+ #include "common/Cycles.h"
  #include "common/deleter.h"
  #include "common/Tub.h"
  #include "RDMAStack.h"