From: Sage Weil <sage@redhat.com>
Date: Tue, 18 Sep 2018 22:24:12 +0000 (-0500)
Subject: Merge PR #24098 into master
X-Git-Tag: v14.0.1~264
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=7591ccd7189f98d63e8aa4c099d0b0b9122d172d;p=ceph.git

Merge PR #24098 into master

* refs/pull/24098/head:
	Rename "include/assert.h"

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

7591ccd7189f98d63e8aa4c099d0b0b9122d172d
diff --cc src/tools/rbd/action/MirrorPool.cc
index 80b3c960f159a,8044816b8660f..db33a20e50cf4
--- a/src/tools/rbd/action/MirrorPool.cc
+++ b/src/tools/rbd/action/MirrorPool.cc
@@@ -19,9 -17,8 +19,9 @@@
  #include <functional>
  #include <iostream>
  #include <regex>
 +#include <set>
  #include <boost/program_options.hpp>
- #include "include/assert.h"
+ #include "include/ceph_assert.h"
  
  #include <atomic>
  
diff --cc src/tools/rbd_mirror/PoolWatcher.h
index c45e1bcf03f40,c9c17ff66f036..1136a319fcada
--- a/src/tools/rbd_mirror/PoolWatcher.h
+++ b/src/tools/rbd_mirror/PoolWatcher.h
@@@ -13,10 -13,10 +13,10 @@@
  #include "common/ceph_context.h"
  #include "common/Mutex.h"
  #include "include/rados/librados.hpp"
 -#include "types.h"
 +#include "tools/rbd_mirror/Types.h"
  #include <boost/functional/hash.hpp>
  #include <boost/optional.hpp>
- #include "include/assert.h"
+ #include "include/ceph_assert.h"
  #include "tools/rbd_mirror/pool_watcher/Types.h"
  
  namespace librbd { struct ImageCtx; }