On Tue, Oct 15, 2013 at 4:37 PM, Helga Velroyen <[email protected]> wrote:
> > > > On Tue, Oct 15, 2013 at 2:00 PM, Thomas Thrainer <[email protected]>wrote: > >> - Bump version numbers to 2.10 in various files >> - Move implemented designs to design-2.10 >> >> Signed-off-by: Thomas Thrainer <[email protected]> >> --- >> >> This patch should still go in master before we branch off 2.10, as those >> changes should be carried over to the new master as well. >> After branching off 2.10, there will be a cleanup patch for master which >> bumps version numbers there and removes old downgrade code. >> >> Makefile.am | 1 + >> README | 4 ++-- >> doc/design-2.10.rst | 16 ++++++++++++++++ >> doc/design-draft.rst | 6 +----- >> doc/hooks.rst | 2 +- >> doc/iallocator.rst | 2 +- >> doc/index.rst | 1 + >> doc/security.rst | 2 +- >> doc/virtual-cluster.rst | 2 +- >> tools/cfgupgrade | 2 +- >> 10 files changed, 26 insertions(+), 12 deletions(-) >> create mode 100644 doc/design-2.10.rst >> >> diff --git a/Makefile.am b/Makefile.am >> index 7f94bd8..d15854e 100644 >> --- a/Makefile.am >> +++ b/Makefile.am >> @@ -502,6 +502,7 @@ docinput = \ >> doc/design-2.7.rst \ >> doc/design-2.8.rst \ >> doc/design-2.9.rst \ >> + doc/design-2.10.rst \ >> doc/design-autorepair.rst \ >> doc/design-bulk-create.rst \ >> doc/design-chained-jobs.rst \ >> diff --git a/README b/README >> index 4266b70..6ef2668 100644 >> --- a/README >> +++ b/README >> @@ -1,5 +1,5 @@ >> -Ganeti 2.9 >> -========== >> +Ganeti 2.10 >> +=========== >> >> For installation instructions, read the INSTALL and the doc/install.rst >> files. >> diff --git a/doc/design-2.10.rst b/doc/design-2.10.rst >> new file mode 100644 >> index 0000000..35c244f >> --- /dev/null >> +++ b/doc/design-2.10.rst >> @@ -0,0 +1,16 @@ >> +================== >> +Ganeti 2.10 design >> +================== >> + >> +The following design documents have been implemented in Ganeti 2.10. >> + >> +- :doc:`design-cmdlib-unittests` >> +- :doc:`design-hotplug` >> +- :doc:`design-openvswitch` >> +- :doc:`design-upgrade` >> + >> +The following designs have been partially implemented in Ganeti 2.10. >> + >> +- :doc:`design-ceph-ganeti-support` >> +- :doc:`design-query-splitting` >> +- :doc:`design-storagetypes` >> > > I'd move that up to 'have been implemented'. There is nothing left except > for bugfixes/cleanup and that will go into 2.10, too. If that, however, > means that it was implemented in 2.10 and in no other version, that is not > true, since it was started in 2.8 and continued in 2.9. > > > > >> diff --git a/doc/design-draft.rst b/doc/design-draft.rst >> index 8eee725..2ee6726 100644 >> --- a/doc/design-draft.rst >> +++ b/doc/design-draft.rst >> @@ -2,7 +2,7 @@ >> Design document drafts >> ====================== >> >> -.. Last updated for Ganeti 2.9 >> +.. Last updated for Ganeti 2.10 >> >> .. toctree:: >> :maxdepth: 2 >> @@ -15,13 +15,9 @@ Design document drafts >> design-storagetypes.rst >> > > Remove this. > > Both changed before pushing, thanks for the review (I actually forgot to ask you about this design, sorry for that...). > design-internal-shutdown.rst >> design-glusterfs-ganeti-support.rst >> - design-openvswitch.rst >> design-hugepages-support.rst >> - design-cmdlib-unittests.rst >> - design-hotplug.rst >> design-optables.rst >> design-ceph-ganeti-support.rst >> - design-upgrade.rst >> design-daemons.rst >> design-hsqueeze.rst >> >> diff --git a/doc/hooks.rst b/doc/hooks.rst >> index a60e4ac..3a2846a 100644 >> --- a/doc/hooks.rst >> +++ b/doc/hooks.rst >> @@ -1,7 +1,7 @@ >> Ganeti customisation using hooks >> ================================ >> >> -Documents Ganeti version 2.9 >> +Documents Ganeti version 2.10 >> >> .. contents:: >> >> diff --git a/doc/iallocator.rst b/doc/iallocator.rst >> index be346dd..456d5ee 100644 >> --- a/doc/iallocator.rst >> +++ b/doc/iallocator.rst >> @@ -1,7 +1,7 @@ >> Ganeti automatic instance allocation >> ==================================== >> >> -Documents Ganeti version 2.9 >> +Documents Ganeti version 2.10 >> >> .. contents:: >> >> diff --git a/doc/index.rst b/doc/index.rst >> index 48ae338..02bc97e 100644 >> --- a/doc/index.rst >> +++ b/doc/index.rst >> @@ -94,6 +94,7 @@ Implemented designs >> design-2.7.rst >> design-2.8.rst >> design-2.9.rst >> + design-2.10.rst >> >> Draft designs >> ------------- >> diff --git a/doc/security.rst b/doc/security.rst >> index 76a4309..81969e9 100644 >> --- a/doc/security.rst >> +++ b/doc/security.rst >> @@ -1,7 +1,7 @@ >> Security in Ganeti >> ================== >> >> -Documents Ganeti version 2.9 >> +Documents Ganeti version 2.10 >> >> Ganeti was developed to run on internal, trusted systems. As such, the >> security model is all-or-nothing. >> diff --git a/doc/virtual-cluster.rst b/doc/virtual-cluster.rst >> index 41e4dba..6b11c03 100644 >> --- a/doc/virtual-cluster.rst >> +++ b/doc/virtual-cluster.rst >> @@ -1,7 +1,7 @@ >> Virtual cluster support >> ======================= >> >> -Documents Ganeti version 2.9 >> +Documents Ganeti version 2.10 >> >> .. contents:: >> >> diff --git a/tools/cfgupgrade b/tools/cfgupgrade >> index 0c9f747..1135103 100755 >> --- a/tools/cfgupgrade >> +++ b/tools/cfgupgrade >> @@ -536,7 +536,7 @@ def main(): >> config_minor, config_revision)) >> DowngradeAll(config_data) >> >> - # Upgrade from 2.{0..7} to 2.9 >> + # Upgrade from 2.{0..9} to 2.10 >> elif config_major == 2 and config_minor in range(0, 10): >> if config_revision != 0: >> logging.warning("Config revision is %s, not 0", config_revision) >> -- >> 1.8.4 >> >> > Apart from that, LGTM > > -- > -- > Helga Velroyen | Software Engineer | [email protected] | > > Google Germany GmbH > Dienerstr. 12 > 80331 München > > Registergericht und -nummer: Hamburg, HRB 86891 > Sitz der Gesellschaft: Hamburg > Geschäftsführer: Graham Law, Christine Elizabeth Flores > -- Thomas Thrainer | Software Engineer | [email protected] | Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores
