Greg Farnum 9506d09e3b Merge remote-tracking branch 'origin/master' into wip-stretch-mode ... Conflicts: src/include/ceph_features.h Signed-off-by: Greg Farnum <gfarnum@redhat.com>		2020-09-15 02:25:07 +00:00
..
api	doc: remove references to ceph-deploy	2020-09-02 21:14:36 +02:00
command	osd/PG: scrub error when objects are larger than osd_max_object_size	2019-08-14 20:25:12 -05:00
configuration	Merge pull request #36946 from zdover23/wip-docs-36796-fix	2020-09-07 10:48:27 +02:00
man	doc: remove references to ceph-deploy	2020-09-02 21:14:36 +02:00
operations	Merge remote-tracking branch 'origin/master' into wip-stretch-mode	2020-09-15 02:25:07 +00:00
troubleshooting	doc: remove references to ceph-deploy	2020-09-02 21:14:36 +02:00
index.rst	doc: remove references to ceph-deploy	2020-09-02 21:14:36 +02:00