From d774ce92d8fd44b4f32b15d5c750d610cfa5474b Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Wed, 3 Aug 2011 17:01:10 +0200
Subject: [PATCH] Add design document for Ganeti 2.5

Including the designs which were actually implemented.

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

diff --git a/Makefile.am b/Makefile.am
index 40d22acdd..9ec8c67c8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -282,6 +282,7 @@ docrst = \
 	doc/design-2.3.rst \
 	doc/design-htools-2.3.rst \
 	doc/design-2.4.rst \
+	doc/design-2.5.rst \
 	doc/design-draft.rst \
 	doc/design-oob.rst \
 	doc/design-cpu-pinning.rst \
diff --git a/doc/design-2.5.rst b/doc/design-2.5.rst
new file mode 100644
index 000000000..ed12f95a2
--- /dev/null
+++ b/doc/design-2.5.rst
@@ -0,0 +1,16 @@
+=================
+Ganeti 2.5 design
+=================
+
+The following design documents have been implemented in Ganeti 2.5:
+
+- :doc:`design-lu-generated-jobs`
+- :doc:`design-chained-jobs`
+- :doc:`design-multi-reloc`
+- :doc:`design-shared-storage`
+
+.. 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 79468d047..63e564496 100644
--- a/doc/design-draft.rst
+++ b/doc/design-draft.rst
@@ -8,11 +8,9 @@ Design document drafts
    design-x509-ca.rst
    design-http-server.rst
    design-impexp2.rst
-   design-lu-generated-jobs.rst
-   design-multi-reloc.rst
    design-cpu-pinning.rst
-   design-chained-jobs.rst
    design-ovf-support.rst
+   design-network.rst
 
 .. vim: set textwidth=72 :
 .. Local Variables:
diff --git a/doc/index.rst b/doc/index.rst
index 34e57bb6c..b36195767 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -21,10 +21,9 @@ Contents:
    design-2.3.rst
    design-htools-2.3.rst
    design-2.4.rst
+   design-2.5.rst
    design-draft.rst
-   design-network.rst
    cluster-merge.rst
-   design-shared-storage.rst
    locking.rst
    hooks.rst
    iallocator.rst
@@ -39,6 +38,10 @@ Contents:
 
    design-oob.rst
    design-query2.rst
+   design-lu-generated-jobs.rst
+   design-chained-jobs.rst
+   design-multi-reloc.rst
+   design-shared-storage.rst
 
 Also see the :ref:`search`.
 
-- 
GitLab