summaryrefslogtreecommitdiffstats
path: root/doc/api
diff options
context:
space:
mode:
authorAlfredo Deza <alfredo.deza@inktank.com>2014-08-14 16:02:07 +0200
committerAlfredo Deza <alfredo.deza@inktank.com>2014-08-14 16:02:25 +0200
commitaec684bfb661dff41a017964fda50e407ad4e989 (patch)
treed2ccc5e2c9fffa0a8ef985535e0f14cf37fb62df /doc/api
parentdoc: update kernel recommendations (avoid 3.15!) (diff)
downloadceph-aec684bfb661dff41a017964fda50e407ad4e989.tar.xz
ceph-aec684bfb661dff41a017964fda50e407ad4e989.zip
add calamari to the api/index section
Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
Diffstat (limited to 'doc/api')
-rw-r--r--doc/api/index.rst14
1 files changed, 11 insertions, 3 deletions
diff --git a/doc/api/index.rst b/doc/api/index.rst
index 71c1cac6c34..7e65aa7836a 100644
--- a/doc/api/index.rst
+++ b/doc/api/index.rst
@@ -22,18 +22,26 @@ See `libcephfs (javadoc)`_.
Ceph Block Device APIs
======================
-See `librbdpy`_.
+See `librbdpy`_.
.. _librbdpy: ../rbd/librbdpy
+Calamari APIs
+=============
+
+See `Calamari API`_.
+
+.. _Calamari API: http://ceph.com/calamari/docs/calamari_rest/index.html
+
+
Ceph Object Store APIs
======================
- See `S3-compatible API`_.
- See `Swift-compatible API`_.
-- See `Admin Ops API`_.
+- See `Admin Ops API`_.
.. _S3-compatible API: ../radosgw/s3/
.. _Swift-compatible API: ../radosgw/swift/
-.. _Admin Ops API: ../radosgw/adminops \ No newline at end of file
+.. _Admin Ops API: ../radosgw/adminops