From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 11 Sep 2019 16:59:51 +0000 (-0700)
Subject: Merge PR #30014 into master
X-Git-Tag: v15.1.0~1595
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a779766be9684c45e50411ac583830bc3d8a030d;p=ceph-ci.git

Merge PR #30014 into master

* refs/pull/30014/head:
	doc: update CephFS overview in introductory page
	doc: filesystem to file system

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Sidharth Anupkrishnan <sanupkri@redhat.com>
Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
---

a779766be9684c45e50411ac583830bc3d8a030d
diff --cc .githubmap
index 9ca7ffe27b3,9ca7ffe27b3..0fd9bc36f2c
--- a/.githubmap
+++ b/.githubmap
@@@ -101,3 -101,3 +101,4 @@@ baruza Barbora Ančincová <bara@redhat
  GabrielBrascher Gabriel Brascher <gabriel@apache.org>
  BlaineEXE Blaine Gardner <bgardner@suse.com>
  travisn Travis Nielsen <tnielsen@redhat.com>
++sidharthanup Sidharth Anupkrishnan <sanupkri@redhat.com>