From: Jason Dillaman <dillaman@redhat.com>
Date: Fri, 2 Dec 2016 19:55:21 +0000 (-0500)
Subject: Merge pull request #1298 from ceph/wip-pre-single-major-branch
X-Git-Tag: v11.1.1~58^2^2~25
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2cee58a45624fc022f5220d99f85c19e088c2c4e;p=ceph.git

Merge pull request #1298 from ceph/wip-pre-single-major-branch

krbd/unmap: pre-single-major is now 3.12.z

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
---

2cee58a45624fc022f5220d99f85c19e088c2c4e