LGTM, thanks
On Thu, Apr 11, 2013 at 5:04 PM, Guido Trotter <[email protected]> wrote: > commit 41930532da081e99c03a8e185af749c623df553a > Merge: 5914192 7ee2098 > Author: Guido Trotter <[email protected]> > Date: Thu Apr 11 17:03:32 2013 -0400 > > Merge branch 'devel-2.7' > > * devel-2.7: (26 commits) > Fix burnin install path > Fix format of the NEWS file > NEWS: Add news entry for the hail disk policy fix > Add shelltests verifying hail applies disk ipolicy per disk > Make the disks parameter available to the constructor > Verify individual disks in Instance > Compatibility fix for GHC 7 > Properly update iv_name of disks while changing templates > Limit the size of networks to /16 > Check minimum size of networks on creation > Fix job queue directory permission problems > The disk size of a diskless instance is 0, not None > Postpone non-urgent TODO from 2.7 to 2.9 > Add tool for creating users and groups > Backwards compatibility fix for Lucid > Properly export errors while reading job list > Fix typo and improve comment > Fix a bug in the Runtime tests > Restrict instance move to templates based on local files > Introduce a constant for the copyable disk templates > ... > > Conflicts: > NEWS: trivial > lib/network.py: trivial > > Signed-off-by: Guido Trotter <[email protected]> > > diff --cc NEWS > index 7f8358c,cad5a97..b8ccc60 > --- a/NEWS > +++ b/NEWS > @@@ -2,28 -2,52 +2,75 @@@ New > ==== > > > +Version 2.8.0 beta1 > +------------------- > + > +*(unreleased)* > + > +- The minimum Python version needed to run Ganeti is now 2.6. > +- The :doc:`Remote API <rapi>` daemon now supports a command line flag > + to always require authentication, ``--require-authentication``. It can > + be specified in ``$sysconfdir/default/ganeti``. > +- A new cluster attribute 'enabled_disk_templates' is introduced. It will > + be used to manage the disk templates to be used by instances in the > cluster. > + Initially, it will be set to a list that includes plain, drbd, if they > were > + enabled by specifying a volume group name, and file and sharedfile, if > those > + were enabled at configure time. Additionally, it will include all disk > + templates that are currently used by instances. The order of disk > templates > + will be based on Ganeti's history of supporting them. In the future, > the > + first entry of the list will be used as a default disk template on > instance > + creation. > +- ``cfgupgrade`` now supports a ``--downgrade`` option to bring the > + configuration back to the previous stable version. > + > + > + Version 2.7.0 rc1 > + ----------------- > + > + *(unreleased)* > + > + - Fix hail to verify disk instance policies on a per-disk basis (Issue > 418). > + > + > + Version 2.7.0 beta2 > + ------------------- > + > + *(Released Tue, 2 Apr 2013)* > + > + - Networks no longer have a "type" slot, since this information was > + unused in Ganeti: instead of it tags should be used. > + - Diskless instances are now externally mirrored (Issue 237). This for > + now has only been tested in conjunction with explicit target nodes for > + migration/failover. > + - The rapi client now has a ``target_node`` option to MigrateInstance. > + - Fix early exit return code for hbal (Issue 386). > + - Fix ``gnt-instance migrate/failover -n`` (Issue 396). > + - Fix ``rbd showmapped`` output parsing (Issue 312). > + - Networks are now referenced indexed by UUID, rather than name. This > + will require running cfgupgrade, from 2.7.0beta1, if networks are in > + use. > + - The OS environment now includes network information. > + - Deleting of a network is now disallowed if any instance nic is using > + it, to prevent dangling references. > + - External storage is now documented in man pages. > + - The exclusive_storage flag can now only be set at nodegroup level. > + - Hbal can now submit an explicit priority with its jobs. > + - Many network related locking fixes. > + - Bump up the required pylint version to 0.25.1. > + - Fix the ``no_remember`` option in RAPI client. > + - Many ipolicy related tests, qa, and fixes. > + - Many documentation improvements and fixes. > + - Fix building with ``--disable-file-storage``. > + - Fix ``-q`` option in htools, which was broken if passed more than > + once. > + - Some haskell/python interaction improvements and fixes. > + - Fix iallocator in case of missing LVM storage. > + - Fix confd config load in case of ``--no-lvm-storage``. > + - The confd/query functionality is now mentioned in the security > + documentation. > ++>>>>>>> devel-2.7 > + > + > Version 2.7.0 beta1 > ------------------- > >
