On Mon, Mar 24, 2014 at 5:07 PM, Klaus Aehlig <[email protected]> wrote:
>
>
> commit a3a8be36c2fb6b32081284dd9ff87dcf58a5f34a
> Merge: 0ca627d 3b8ca90
> Author: Klaus Aehlig <[email protected]>
> Date:   Mon Mar 24 16:34:01 2014 +0100
>
>     Merge branch 'stable-2.10' into stable-2.11
>
>     * stable-2.10
>       Bump version to 2.10.2
>       Prepare NEWS file for 2.10.2
>       Allow releases scheduled 5 days in advance
>       Fix conflict between virtio + spice or soundhw
>       Fix bitarray ops wrt PCI slots
>
>     * stable-2.9
>       Make watcher submit queries low priority
>
>     * stable-2.8
>       Include qa/patch in Makefile
>       Handle empty patches better
>       Move message formatting functions to separate file
>       Add optional ordering of QA patch files
>       Allow multiple QA patches
>       Refactor current patching code
>
>     Conflicts:
>         NEWS: take all additions
>         configure.ac: ignore revision bump on 2.10
>         lib/watcher/__init__.py: ignore priority for
>             query requests
>         qa/qa_utils.py: trivial
>
> diff --cc NEWS
> index 8cb62a8,cc1153a..3e0c8a8
> --- a/NEWS
> +++ b/NEWS
> @@@ -2,97 -2,17 +2,108 @@@ New
>   ====
>
>
>  +Version 2.11.0 rc1
>  +------------------
>  +
>  +*(Released Thu, 20 Mar 2014)*
>  +
>  +Incompatible/important changes
>  +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>  +
>  +- ``gnt-node list`` no longer shows disk space information for shared file
>  +  disk templates because it is not a node attribute. (For example, if you 
> have
>  +  both the file and shared file disk templates enabled, ``gnt-node list`` 
> now
>  +  only shows information about the file disk template.)
>  +- The shared file disk template is now in the new 'sharedfile' storage type.
>  +  As a result, ``gnt-node list-storage -t file`` now only shows information
>  +  about the file disk template and you may use ``gnt-node list-storage -t
>  +  sharedfile`` to query storage information for the shared file disk 
> template.
>  +- Over luxi, syntactially incorrect queries are now rejected as a whole;
>  +  before, a 'SumbmitManyJobs' request was partially executed, if the outer
>  +  structure of the request was syntactically correct. As the luxi protocol
>  +  is internal (external applications are expected to use RAPI), the impact
>  +  of this incompatible change should be limited.
>  +- Queries for nodes, instances, groups, backups and networks are now
>  +  exclusively done via the luxi daemon. Legacy python code was removed,
>  +  as well as the --enable-split-queries configuration option.
>  +- Orphan volumes errors are demoted to warnings and no longer affect the 
> exit
>  +  code of ``gnt-cluster verify``.
>  +- RPC security got enhanced by using different client SSL certificates
>  +  for each node. In this context 'gnt-cluster renew-crypto' got a new
>  +  option '--renew-node-certificates', which renews the client
>  +  certificates of all nodes. After a cluster upgrade from pre-2.11, run
>  +  this to create client certificates and activate this feature.
>  +
>  +New features
>  +~~~~~~~~~~~~
>  +
>  +- Instance moves, backups and imports can now use compression to transfer 
> the
>  +  instance data.
>  +- Node groups can be configured to use an SSH port different than the
>  +  default 22.
>  +- Added experimental support for Gluster distributed file storage as the
>  +  ``gluster`` disk template under the new ``sharedfile`` storage type 
> through
>  +  automatic management of per-node FUSE mount points. You can configure the
>  +  mount point location at ``gnt-cluster init`` time by using the new
>  +  ``--gluster-storage-dir`` switch.
>  +- Job scheduling is now handled by luxid, and the maximal number of jobs 
> running
>  +  in parallel is a run-time parameter of the cluster.
>  +
>  +New dependencies
>  +~~~~~~~~~~~~~~~~
>  +
>  +The following new dependencies have been added:
>  +
>  +For Haskell:
>  +
>  +- ``zlib`` library (http://hackage.haskell.org/package/base64-bytestring)
>  +
>  +- ``base64-bytestring`` library (http://hackage.haskell.org/package/zlib),
>  +  at least version 1.0.0.0
>  +
>  +Since 2.11.0 beta1
>  +~~~~~~~~~~~~~~~~~~
>  +
>  +This was the first RC release of the 2.11 series. Since 2.11.0 beta1:
>  +
>  +- Convert int to float when checking config. consistency
>  +- Rename compression option in gnt-backup export
>  +
>  +Inherited from the 2.9 branch:
>  +
>  +- Fix error introduced during merge
>  +- gnt-cluster copyfile: accept relative paths
>  +
>  +Inherited from the 2.8 branch:
>  +
>  +- Improve RAPI detection of the watcher
>  +- Add patching QA configuration files on buildbots
>  +- Enable a timeout for instance shutdown
>  +- Allow KVM commands to have a timeout
>  +- Allow xen commands to have a timeout
>  +- Fix wrong docstring
>  +
>  +
>  +Version 2.11.0 beta1
>  +--------------------
>  +
>  +*(Released Wed, 5 Mar 2014)*
>  +
>  +This was the first beta release of the 2.11 series. All important changes
>  +are listed in the latest 2.11 entry.
>  +
>  +
> + Version 2.10.2
> + --------------
> +
> + *(Released Mon, 24 Mar 2014)*
> +
> + - Fix conflict between virtio + spice or soundhw (issue 757)
> + - accept relative paths in gnt-cluster copyfile (issue 754)
> + - Introduce shutdown timeout for 'xm shutdown' command
> + - Improve RAPI detection of the watcher (issue 752)
> +
> +
>   Version 2.10.1
>   --------------
>
>
> --
> 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

LGTM, thanks.

Michele

-- 
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

Reply via email to