Also added doc/design-2.16.rst, which lists the
designs that were implemented or partially implemented.

Signed-off-by: BSRK Aditya <[email protected]>
---
 Makefile.am                 |    1 +
 NEWS                        |    4 ++--
 README                      |    2 +-
 cabal/ganeti.template.cabal |    2 +-
 doc/design-2.16.rst         |   14 ++++++++++++++
 doc/design-draft.rst        |    5 +----
 doc/index.rst               |    4 ++++
 7 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 doc/design-2.16.rst

diff --git a/Makefile.am b/Makefile.am
index c7dbea5..7f89aa6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -659,6 +659,7 @@ docinput = \
        doc/design-2.13.rst \
        doc/design-2.14.rst \
        doc/design-2.15.rst \
+       doc/design-2.16.rst \
        doc/design-allocation-efficiency.rst \
        doc/design-autorepair.rst \
        doc/design-bulk-create.rst \
diff --git a/NEWS b/NEWS
index 2bfc0c6..05d6ed2 100644
--- a/NEWS
+++ b/NEWS
@@ -2,8 +2,8 @@ News
 ====
 
 
-Version 2.16.0
---------------
+Version 2.16.0 beta1
+--------------------
 
 *(unreleased)*
 
diff --git a/README b/README
index 1c78531..4327d89 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Ganeti 2.15
+Ganeti 2.16
 ===========
 
 For installation instructions, read the INSTALL and the doc/install.rst
diff --git a/cabal/ganeti.template.cabal b/cabal/ganeti.template.cabal
index 90bc0f4..ae405fa 100644
--- a/cabal/ganeti.template.cabal
+++ b/cabal/ganeti.template.cabal
@@ -1,5 +1,5 @@
 name:                ganeti
-version:             2.15
+version:             2.16
 homepage:            http://www.ganeti.org
 license:             BSD2
 license-file:        COPYING
diff --git a/doc/design-2.16.rst b/doc/design-2.16.rst
new file mode 100644
index 0000000..0dc02ec
--- /dev/null
+++ b/doc/design-2.16.rst
@@ -0,0 +1,14 @@
+==================
+Ganeti 2.16 design
+==================
+
+The following designs have been partially implemented in Ganeti 2.16.
+
+- :doc:`design-configlock`
+- :doc `design-os`
+
+The following designs' implementations were completed in Ganeti 2.16.
+
+- :doc `design-location`
+- :doc:`design-plain-redundancy`
+- :doc:`design-shared-storage-redundancy`
diff --git a/doc/design-draft.rst b/doc/design-draft.rst
index e4dd2e0..3f2a1f3 100644
--- a/doc/design-draft.rst
+++ b/doc/design-draft.rst
@@ -2,7 +2,7 @@
 Design document drafts
 ======================
 
-.. Last updated for Ganeti 2.15
+.. Last updated for Ganeti 2.16
 
 .. toctree::
    :maxdepth: 2
@@ -19,15 +19,12 @@ Design document drafts
    design-move-instance-improvements.rst
    design-node-security.rst
    design-ifdown.rst
-   design-location.rst
    design-reservations.rst
    design-sync-rate-throttling.rst
    design-network2.rst
    design-configlock.rst
    design-multi-storage-htools.rst
-   design-shared-storage-redundancy.rst
    design-repaird.rst
-   design-plain-redundancy.rst
 
 .. vim: set textwidth=72 :
 .. Local Variables:
diff --git a/doc/index.rst b/doc/index.rst
index 16d0301..225c88f 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -81,6 +81,7 @@ and draft versions (which are either incomplete or not 
implemented).
    design-2.13.rst
    design-2.14.rst
    design-2.15.rst
+   design-2.16.rst
 
 Draft designs
 -------------
@@ -114,6 +115,7 @@ Draft designs
    design-hotplug.rst
    design-internal-shutdown.rst
    design-kvmd.rst
+   design-location.rst
    design-linuxha.rst
    design-lu-generated-jobs.rst
    design-monitoring-agent.rst
@@ -131,11 +133,13 @@ Draft designs
    design-ovf-support.rst
    design-partitioned
    design-performance-tests.rst
+   design-plain-redundancy.rst
    design-query2.rst
    design-query-splitting.rst
    design-reason-trail.rst
    design-restricted-commands.rst
    design-shared-storage.rst
+   design-shared-storage-redundancy.rst
    design-ssh-ports.rst
    design-storagetypes.rst
    design-systemd.rst
-- 
1.7.10.4

Reply via email to