From: Kefu Chai <kchai@redhat.com>
Date: Mon, 6 Apr 2015 02:36:22 +0000 (+0800)
Subject: man: appease sphinx by providing a toc doc
X-Git-Tag: v9.0.0~24^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=707a2f77c41b3061ad0f9adeb594a94d25452b4b;p=ceph.git

man: appease sphinx by providing a toc doc

Fixes: #11324
Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/man/conf.py b/man/conf.py
index 375bfb987cf9..4cadf231dad9 100644
--- a/man/conf.py
+++ b/man/conf.py
@@ -41,3 +41,6 @@ def _get_manpages():
                 )
 
 man_pages = list(_get_manpages())
+# sphinx warns if no toc is found, so feed it with a random file
+# which is also rendered in this run.
+master_doc = '8/ceph'
diff --git a/src/rocksdb b/src/rocksdb
index 6ca7befb5576..05da5930f3a1 160000
--- a/src/rocksdb
+++ b/src/rocksdb
@@ -1 +1 @@
-Subproject commit 6ca7befb55767784a447a5daddd09e387ec92bd3
+Subproject commit 05da5930f3a130c4dea879a85a26f2c8ac7465c4