diff --git a/Makefile.am b/Makefile.am index 40d22acdd5884d1ed285da4abf5195948aacd251..9ec8c67c8ddcabfe6064f21cf000c45a2981081e 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 0000000000000000000000000000000000000000..ed12f95a2a82b8a7d01b977db0730b82c48b7660 --- /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 79468d047136fea3f00ad5a98dd1ae237ba83e03..63e56449691e82e6b81e2497d98229b0f853e1a9 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 34e57bb6c90b90134ef1278a2b22f1ff0c03d674..b36195767809f2114a5bbfc62eb603110aa4cbbe 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`.