doc/releases: include octopus in index

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/doc/releases/general.rst b/doc/releases/general.rst
index 2fa172700e6cd973c9b9c0a8489dc11bf7ed00bd..2d69e2026e20bf0fcefcb5c701cff90de598325e 100644 (file)
--- a/doc/releases/general.rst
+++ b/doc/releases/general.rst
@@ -122,7 +122,7 @@ Release timeline
 .. ceph_timeline:: releases.yml development nautilus mimic luminous kraken jewel infernalis hammer giant firefly emperor
 
 .. _Octopus: ../octopus
-.. _15.1.0: ../octopus#v15-1-0-octopus
+.. _15.2.0: ../octopus#v15-2-0-octopus
 
 .. _Nautilus: ../nautilus
 .. _14.2.8: ../nautilus#v14-2-8-nautilus

diff --git a/doc/releases/index.rst b/doc/releases/index.rst
index b5806a7326facf1ebf56167c869427a9b7554af2..0d9bd66ad99247b5571344cd852f3d31d151429a 100644 (file)
--- a/doc/releases/index.rst
+++ b/doc/releases/index.rst
@@ -21,6 +21,7 @@ Active Releases
 .. toctree::
    :maxdepth: 1
 
+   Octopus <octopus>
    Nautilus <nautilus>
    Mimic <mimic>
    Luminous <luminous>

diff --git a/doc/releases/releases.yml b/doc/releases/releases.yml
index 0472c1cd6ad375b8ea0558c601668301966f9a62..c6d823e6f028f10b698beaf778dafc4bd43f50fd 100644 (file)
--- a/doc/releases/releases.yml
+++ b/doc/releases/releases.yml
@@ -12,6 +12,11 @@
 # If a version might represent an actual number (e.g. 0.80) quote it.
 #
 releases:
+  octopus:
+    releases:
+      - version: 15.2.0
+        released: 2020-03-23
+    target_eol: 2022-06-01
   nautilus:
     releases:
       - version: 14.2.8
@@ -241,8 +246,12 @@ releases:
 
 development:
   releases:
+    - version: 15.1.1
+      released: 2020-03-13
+      skip_ref: true
     - version: 15.1.0
       released: 2020-01-29
+      skip_ref: true
     - version: 15.0.0
       released: 2019-04-03
       skip_ref: true