From 40309ed7f1544c28a9a5374216764428185c62db Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Wed, 10 Oct 2012 11:44:13 +0200
Subject: [PATCH] Add list of design documents implemented in version 2.6

Each version should have its dedicated list.

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
 Makefile.am          |  1 +
 doc/design-2.6.rst   | 14 ++++++++++++++
 doc/design-draft.rst |  2 --
 doc/index.rst        |  3 +++
 4 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 doc/design-2.6.rst

diff --git a/Makefile.am b/Makefile.am
index f7b2a51a7..e346c4659 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -323,6 +323,7 @@ docrst = \
 	doc/design-htools-2.3.rst \
 	doc/design-2.4.rst \
 	doc/design-2.5.rst \
+	doc/design-2.6.rst \
 	doc/design-draft.rst \
 	doc/design-oob.rst \
 	doc/design-cpu-pinning.rst \
diff --git a/doc/design-2.6.rst b/doc/design-2.6.rst
new file mode 100644
index 000000000..055816861
--- /dev/null
+++ b/doc/design-2.6.rst
@@ -0,0 +1,14 @@
+=================
+Ganeti 2.6 design
+=================
+
+The following design documents have been implemented in Ganeti 2.6:
+
+- :doc:`design-cpu-pinning`
+- :doc:`design-ovf-support`
+
+.. vim: set textwidth=72 :
+.. Local Variables:
+.. mode: rst
+.. fill-column: 72
+.. End:
diff --git a/doc/design-draft.rst b/doc/design-draft.rst
index 629a386c2..cfbd448ec 100644
--- a/doc/design-draft.rst
+++ b/doc/design-draft.rst
@@ -8,8 +8,6 @@ Design document drafts
    design-x509-ca.rst
    design-http-server.rst
    design-impexp2.rst
-   design-cpu-pinning.rst
-   design-ovf-support.rst
    design-network.rst
    design-node-state-cache.rst
    design-resource-model.rst
diff --git a/doc/index.rst b/doc/index.rst
index 95a8e1285..eaeb3bec1 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -22,6 +22,7 @@ Contents:
    design-htools-2.3.rst
    design-2.4.rst
    design-2.5.rst
+   design-2.6.rst
    design-draft.rst
    cluster-merge.rst
    locking.rst
@@ -43,6 +44,8 @@ Contents:
    design-chained-jobs.rst
    design-multi-reloc.rst
    design-shared-storage.rst
+   design-cpu-pinning.rst
+   design-ovf-support.rst
 
 Also see the :ref:`search`.
 
-- 
GitLab