From: Josh Durgin <jdurgin@redhat.com>
Date: Sun, 1 Feb 2015 06:36:05 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/wip-4087'
X-Git-Tag: v0.93~143
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=26ba4315af1bcb89dde012e0bcd8b9e3bf0c23c3;p=ceph.git

Merge remote-tracking branch 'origin/wip-4087'

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Conflicts:
	src/librbd/LibrbdWriteback.cc
---

26ba4315af1bcb89dde012e0bcd8b9e3bf0c23c3
diff --cc src/librbd/LibrbdWriteback.cc
index aee504c81acc,733e9ec5a95b..dd8f46b87116
--- a/src/librbd/LibrbdWriteback.cc
+++ b/src/librbd/LibrbdWriteback.cc
@@@ -14,7 -15,7 +15,8 @@@
  #include "librbd/ImageCtx.h"
  #include "librbd/internal.h"
  #include "librbd/LibrbdWriteback.h"
 +#include "librbd/AioCompletion.h"
+ #include "librbd/ObjectMap.h"
  
  #include "include/assert.h"