From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 7 Jul 2017 04:38:45 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/pull/15937/head' into master
X-Git-Tag: v12.1.1~149
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=64c6079d69baa193ce6d799d49f40976496dfaae;p=ceph.git

Merge remote-tracking branch 'upstream/pull/15937/head' into master

* upstream/pull/15937/head:
  qa: remove unused quota config option

Reviewed-by: John Spray <jspray@redhat.com>
---

64c6079d69baa193ce6d799d49f40976496dfaae