LGTM, thanks.
On Mon, Sep 30, 2013 at 10:05 AM, Klaus Aehlig <[email protected]> wrote: > > commit b1c39b76005068d2cce4afe09de1f1bed6de0646 > Merge: eebc8ab 3dda321 > Author: Klaus Aehlig <[email protected]> > Date: Mon Sep 30 09:45:54 2013 +0200 > > Merge branch 'stable-2.8' into stable-2.9 > > * stable-2.8 > Fix wrong release date in the NEWS file > Version bump for 2.8.0 > Add daemon split design doc > > * stable-2.7 > Version bump for 2.7.2 > > Conflicts: > Makefile.am > NEWS > configure.ac > doc/design-draft.rst > configure.ac: ignore version change in stable-2.8 > rest: take both additions > > diff --cc Makefile.am > index 5568d43,e060963..d114547 > --- a/Makefile.am > +++ b/Makefile.am > @@@ -445,7 -424,7 +445,8 @@@ docinput = > doc/design-cpu-pinning.rst \ > doc/design-device-uuid-name.rst \ > doc/design-draft.rst \ > + doc/design-glusterfs-ganeti-support.rst \ > + doc/design-daemons.rst \ > doc/design-htools-2.3.rst \ > doc/design-http-server.rst \ > doc/design-impexp2.rst \ > diff --cc NEWS > index ce97e11,35b782c..7e244ab > --- a/NEWS > +++ b/NEWS > @@@ -2,75 -2,10 +2,75 @@@ New > ==== > > > +Version 2.9.0 beta1 > +------------------- > + > +*(Released Thu, 29 Aug 2013)* > + > +Incompatible/important changes > +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > + > +- hroller now also plans for capacity to move non-redundant instances off > + any node to be rebooted; the old behavior of completely ignoring any > + non-redundant instances can be restored by adding the > --ignore-non-redundant > + option. > +- The cluster option '--no-lvm-storage' was removed in favor of the new > option > + '--enabled-disk-templates'. > +- On instance creation, disk templates no longer need to be specified > + with '-t'. The default disk template will be taken from the list of > + enabled disk templates. > +- The monitoring daemon is now running as root, in order to be able to > collect > + information only available to root (such as the state of Xen > instances). > +- The ConfD client is now IPv6 compatible. > +- File and shared file storage is no longer dis/enabled at configure > time, > + but using the option '--enabled-disk-templates' at cluster > initialization and > + modification. > +- The default directories for file and shared file storage are not > anymore > + specified at configure time, but taken from the cluster's > configuration. > + They can be set at cluster initialization and modification with > + '--file-storage-dir' and '--shared-file-storage-dir'. > +- Cluster verification now includes stricter checks regarding the > + default file and shared file storage directories. It now checks that > + the directories are explicitely allowed in the 'file-storage-paths' > file and > + that the directories exist on all nodes. > +- The list of allowed disk templates in the instance policy and the list > + of cluster-wide enabled disk templates is now checked for consistency > + on cluster or group modification. On cluster initialization, the > ipolicy > + disk templates are ensured to be a subset of the cluster-wide enabled > + disk templates. > + > +New features > +~~~~~~~~~~~~ > + > +- DRBD 8.4 support. Depending on the installed DRBD version, Ganeti now > uses > + the correct command syntax. It is possible to use different DRBD > versions > + on different nodes as long as they are compatible to each other. This > + enables rolling upgrades of DRBD with no downtime. As permanent > operation > + of different DRBD versions within a node group is discouraged, > + ``gnt-cluster verify`` will emit a warning if it detects such a > situation. > +- New "inst-status-xen" data collector for the monitoring daemon, > providing > + information about the state of the xen instances on the nodes. > +- New "lv" data collector for the monitoring daemon, collecting data > about the > + logical volumes on the nodes, and pairing them with the name of the > instances > + they belong to. > +- New "diskstats" data collector, collecting the data from > /proc/diskstats and > + presenting them over the monitoring daemon interface. > +- The ConfD client is now IPv6 compatible. > + > +New dependencies > +~~~~~~~~~~~~~~~~ > +The following new dependencies have been added. > + > +Python > + > +- ``python-mock`` (http://www.voidspace.org.uk/python/mock/) is now a > required > + for the unit tests (and only used for testing). > + > + > - Version 2.8.0 rc3 > - ----------------- > + Version 2.8.0 > + ------------- > > - *(Released Tue, 17 Sep 2013)* > + *(Released Mon, 30 Sep 2013)* > > Incompatible/important changes > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > diff --cc doc/design-draft.rst > index eef9a0d,04dce6b..d69cd2f > --- a/doc/design-draft.rst > +++ b/doc/design-draft.rst > @@@ -12,10 -12,11 +12,11 @@@ Design document draft > design-impexp2.rst > design-resource-model.rst > design-query-splitting.rst > - design-partitioned.rst > - design-monitoring-agent.rst > - design-hroller.rst > design-storagetypes.rst > + design-internal-shutdown.rst > + design-glusterfs-ganeti-support.rst > + design-openvswitch.rst > + design-daemons.rst > > .. vim: set textwidth=72 : > .. Local Variables: > > > -- > Klaus Aehlig > Google Germany GmbH, Dienerstr. 12, 80331 Muenchen > Registergericht und -nummer: Hamburg, HRB 86891 > Sitz der Gesellschaft: Hamburg > Geschaeftsfuehrer: 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
