]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #25793 into master
authorSage Weil <sage@redhat.com>
Fri, 4 Jan 2019 21:43:23 +0000 (15:43 -0600)
committerSage Weil <sage@redhat.com>
Fri, 4 Jan 2019 21:43:24 +0000 (15:43 -0600)
* 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>
1  2 
.githubmap

diff --cc .githubmap
index a0aecda1a3b0159492ebdac92fc6d41d7cc24dd9,a0aecda1a3b0159492ebdac92fc6d41d7cc24dd9..295b2d0995f60142624ca33dec89819231e68c05
@@@ -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>