From: Sage Weil <sage@redhat.com>
Date: Fri, 4 Jan 2019 21:43:23 +0000 (-0600)
Subject: Merge PR #25793 into master
X-Git-Tag: v14.1.0~483
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a82db5978dfcbcc4651371ca167195c0fc4549ac;p=ceph.git

Merge PR #25793 into master

* refs/pull/25793/head:
	Merge remote-tracking branch 'private/wip-mon-kv-fix' into wip-mimic-4
	Merge remote-tracking branch 'private/wip-rgw-max-keys' into wip-mimic-4
	doc/releases/mimic: v13.2.4
	rgw: fix issues with 'enforce bounds' patch
	rgw: enforce bounds on max-keys/max-uploads/max-parts
	mon/config-key: limit caps allowed to access the store

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: David Galloway <dgallowa@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
---

a82db5978dfcbcc4651371ca167195c0fc4549ac
diff --cc .githubmap
index a0aecda1a3b0,a0aecda1a3b0..295b2d0995f6
--- a/.githubmap
+++ b/.githubmap
@@@ -90,3 -90,3 +90,4 @@@ batrick Patrick Donnelly <pdonnell@redh
  noahdesu Noah Watkins <nwatkins@redhat.com>
  tserong Tim Serong <tserong@suse.com>
  hsiang41 Rick Chen <rick.chen@prophetstor.com>
++djgalloway David Galloway <dgallowa@redhat.com>