From: Nathan Cutler <ncutler@suse.com>
Date: Wed, 25 Nov 2020 18:06:14 +0000 (+0100)
Subject: doc/releases: add recent releases to timeline
X-Git-Tag: v16.1.0~396^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F38289%2Fhead;p=ceph.git

doc/releases: add recent releases to timeline

Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/doc/releases/general.rst b/doc/releases/general.rst
index 7bee3c01da4..be1ee9b4e91 100644
--- a/doc/releases/general.rst
+++ b/doc/releases/general.rst
@@ -122,6 +122,8 @@ Release timeline
 .. ceph_timeline:: releases.yml development octopus nautilus mimic luminous kraken jewel infernalis hammer giant firefly
 
 .. _Octopus: ../octopus
+.. _15.2.7: ../octopus#v15-2-7-octopus
+.. _15.2.6: ../octopus#v15-2-6-octopus
 .. _15.2.5: ../octopus#v15-2-5-octopus
 .. _15.2.4: ../octopus#v15-2-4-octopus
 .. _15.2.3: ../octopus#v15-2-3-octopus
@@ -130,6 +132,7 @@ Release timeline
 .. _15.2.0: ../octopus#v15-2-0-octopus
 
 .. _Nautilus: ../nautilus
+.. _14.2.14: ../nautilus#v14-2-14-nautilus
 .. _14.2.13: ../nautilus#v14-2-13-nautilus
 .. _14.2.12: ../nautilus#v14-2-12-nautilus
 .. _14.2.11: ../nautilus#v14-2-11-nautilus
diff --git a/doc/releases/releases.yml b/doc/releases/releases.yml
index da5b7b3dcf4..44cbfdcec93 100644
--- a/doc/releases/releases.yml
+++ b/doc/releases/releases.yml
@@ -15,6 +15,10 @@ releases:
   octopus:
     target_eol: 2022-06-01
     releases:
+      - version: 15.2.7
+        released: 2020-11-30
+      - version: 15.2.6
+        released: 2020-11-18
       - version: 15.2.5
         released: 2020-09-16
       - version: 15.2.4
@@ -31,6 +35,8 @@ releases:
   nautilus:
     target_eol: 2021-06-01
     releases:
+      - version: 14.2.14
+        released: 2020-11-18
       - version: 14.2.13
         released: 2020-11-02
       - version: 14.2.12