]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'upstream/pull/15937/head' into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 7 Jul 2017 04:38:45 +0000 (21:38 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 7 Jul 2017 04:38:45 +0000 (21:38 -0700)
* upstream/pull/15937/head:
  qa: remove unused quota config option

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

Trivial merge