From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 21 Jul 2017 20:22:50 +0000 (-0700)
Subject: Merge PR 16231 into master
X-Git-Tag: v12.1.2~176
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4eb985085fdb8b8f4dca27093f8ecb9480aee089;p=ceph.git

Merge PR 16231 into master

* refs/remotes/upstream/pull/16231/head:
	Client: get rid of variable "butnot" in "client::get_caps"

Reviewed-by: Zheng Yan <zyan@redhat.com>
---

4eb985085fdb8b8f4dca27093f8ecb9480aee089