]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #30014 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 11 Sep 2019 16:59:51 +0000 (09:59 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Wed, 11 Sep 2019 16:59:51 +0000 (09:59 -0700)
* 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>
1  2 
.githubmap
doc/mgr/dashboard.rst
doc/mgr/orchestrator_cli.rst

diff --cc .githubmap
index 9ca7ffe27b31dc6170422fb019c6d70fcc709908,9ca7ffe27b31dc6170422fb019c6d70fcc709908..0fd9bc36f2c04d6c2cf35e4c3da3a8b140ec6b23
@@@ -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>
Simple merge
Simple merge