From: Sage Weil <sage@redhat.com>
Date: Thu, 21 Nov 2019 22:26:04 +0000 (-0600)
Subject: Merge PR #31465 into master
X-Git-Tag: v15.1.0~804
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a15af0a053baeb7149936aedadcbbb1ea82cda7a;p=ceph.git

Merge PR #31465 into master

* refs/pull/31465/head:
	doc/install/containers: add summary of containers and branches

Reviewed-by: Dan Mick <dmick@redhat.com>
---

a15af0a053baeb7149936aedadcbbb1ea82cda7a