From: David Zafman <dzafman@redhat.com>
Date: Thu, 7 Jan 2016 22:50:10 +0000 (-0800)
Subject: Merge pull request #7102 from dzafman/wip-cot-fixes
X-Git-Tag: v10.0.3~110
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4e3bd8bbec5c48fbb489b54b33839ba543bba56e;p=ceph.git

Merge pull request #7102 from dzafman/wip-cot-fixes

Fix for make check.

Reviewed-by: Sage Weil <sage@redhat.com>
---

4e3bd8bbec5c48fbb489b54b33839ba543bba56e