From: Torben Hørup <th@synack.fo>
Date: Mon, 10 Jun 2019 07:19:16 +0000 (+0200)
Subject: Doc: update release schedule
X-Git-Tag: v15.1.0~2483^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=42a04ff11442df3a742d0efd89c3b7597ab42e41;p=ceph.git

Doc: update release schedule

Added nautilus + the latest releases from mimic and luminous
in order to keep dumpling column, ceph_releases is modified to allow 13 columns

Signed-off-by: Torben Hørup <th@synack.fo>
---

diff --git a/doc/_ext/ceph_releases.py b/doc/_ext/ceph_releases.py
index 057e13bbc817..5ec848ce3fab 100644
--- a/doc/_ext/ceph_releases.py
+++ b/doc/_ext/ceph_releases.py
@@ -106,7 +106,7 @@ class CephReleases(Directive):
 
 class CephTimeline(Directive):
     has_content = False
-    required_arguments = 12
+    required_arguments = 13
     optional_arguments = 0
     option_spec = {}
 
diff --git a/doc/releases/releases.yml b/doc/releases/releases.yml
index 3558b72d1d81..2c5168ed3df1 100644
--- a/doc/releases/releases.yml
+++ b/doc/releases/releases.yml
@@ -12,8 +12,19 @@
 # If a version might represent an actual number (e.g. 0.80) quote it.
 #
 releases:
+  nautilus:
+    releases:
+      - version: 14.2.1
+        released: 2019-04-29
+      - version: 14.2.0
+        released: 2019-03-19
+
   mimic:
     releases:
+      - version: 13.2.6
+        released: 2019-06-04
+      - version: 13.2.5
+        released: 2019-03-13
       - version: 13.2.4
         released: 2019-01-07
       - version: 13.2.3
@@ -27,6 +38,10 @@ releases:
   
   luminous:
     releases:
+      - version: 12.2.12
+        released: 2019-04-12
+      - version: 12.2.11
+        released: 2019-01-31
       - version: 12.2.10
         released: 2018-11-27
       - version: 12.2.9
@@ -203,6 +218,18 @@ releases:
 
 development:
   releases:
+    - version: 14.1.1
+      released:  2019-03-11
+      skip_ref: true        
+    - version: 14.1.0
+      released:  2019-02-22
+      skip_ref: true  
+    - version: 14.0.1
+      released:  2018-11-05
+      skip_ref: true
+    - version: 14.0.0
+      released:  2018-05-06
+      skip_ref: true      
     - version: 13.1.0
       released: 2018-05-01
       skip_ref: true
diff --git a/doc/releases/schedule.rst b/doc/releases/schedule.rst
index e116e9e3e62f..f18fe20e9ff9 100644
--- a/doc/releases/schedule.rst
+++ b/doc/releases/schedule.rst
@@ -10,16 +10,24 @@ Current
 Timeline
 --------
 
-.. ceph_timeline:: releases.yml development mimic luminous kraken jewel infernalis hammer giant firefly emperor dumpling
+.. ceph_timeline:: releases.yml development nautilus mimic luminous kraken jewel infernalis hammer giant firefly emperor dumpling
+
+.. _Nautilus: ../nautilus
+.. _14.2.1: ../nautilus#v14-2-1-nautilus
+.. _14.2.0: ../nautilus#v14-2-0-nautilus
 
 .. _Mimic: ../mimic
+.. _13.2.6: ../mimic#v13-2-6-mimic
+.. _13.2.5: ../mimic#v13-2-5-mimic
 .. _13.2.4: ../mimic#v13-2-4-mimic
 .. _13.2.3: ../mimic#v13-2-3-mimic
 .. _13.2.2: ../mimic#v13-2-2-mimic
 .. _13.2.1: ../mimic#v13-2-1-mimic
 .. _13.2.0: ../mimic#v13-2-0-mimic
 
-.. _Luminous: ../luminous#v12-2-0-luminous
+.. _Luminous: ../luminous
+.. _12.2.12: ../luminous#v12-2-12-luminous
+.. _12.2.11: ../luminous#v12-2-11-luminous
 .. _12.2.10: ../luminous#v12-2-10-luminous
 .. _12.2.9: ../luminous#v12-2-9-luminous
 .. _12.2.8: ../luminous#v12-2-8-luminous