On Wed, May 14, 2014 at 2:23 PM, 'Thomas Thrainer' via ganeti-devel <
[email protected]> wrote:

> commit dc05460da08e6d1817e5c9d439c19b0a3f1e8a48
> Merge: 5c4731e bccc365
> Author: Thomas Thrainer <[email protected]>
> Date:   Wed May 14 14:17:47 2014 +0200
>
>     Merge branch 'stable-2.11' into stable-2.12
>
>     * stable-2.11
>       Bump revision to 2.11.1
>       Prepare NEWS file for 2.11.1
>
>     * stable-2.10
>       Postpone 2.10.4 release to May 15th
>       Don't fail QA if submitting a job takes too long
>       Revision bump for the 2.10.4 release
>       Prepare NEWS file for 2.10.4 release
>
>     * stable-2.9
>       On expanding jobs, extend reason trail
>       Add LC_ALL=en_US.UTF-8 before running check-man-warnings
>
>     Conflicts:
>         NEWS (take both additions)
>         configure.ac (take stable-2.12 versions)
>
>     Signed-off-by: Thomas Thrainer <[email protected]>
>
> diff --cc NEWS
> index 07abfdf,1166bad..d90aac6
> --- a/NEWS
> +++ b/NEWS
> @@@ -2,43 -2,47 +2,85 @@@ New
>   ====
>
>
>  +Version 2.12.0 alpha1
>  +---------------------
>  +
>  +*(unreleased)*
>  +
>  +Incompatible/important changes
>  +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>  +
>  +- Do not use debug mode in production. Certain daemons will issue
> warnings
>  +  when launched in debug mode. Some debug logging violates some of the
> new
>  +  invariants in the system (see "New features"). The logging has been
> kept as
>  +  it aids diagnostics and development.
>  +
>  +New features
>  +~~~~~~~~~~~~
>  +
>  +- OS install script parameters now come in public, private and secret
>  +  varieties:
>  +
>  +  - Public parameters are like all other parameters in Ganeti.
>  +  - Ganeti will not log private and secret parameters, *unless* it is
> running
>  +    in debug mode.
>  +  - Ganeti will not save secret parameters to configuration. Secret
> parameters
>  +    must be supplied every time you install, or reinstall, an instance.
>  +  - Attempting to override public parameters with private or secret
> parameters
>  +    results in an error. Similarly, you may not use secret parameters to
>  +    override private parameters.
>  +
>  +- The move-instance tool can now attempt to allocate an instance by using
>  +  opportunistic locking when an iallocator is used.
>  +- The build system creates sample systemd unit files, available under
>  +  doc/examples/systemd. These unit files allow systemd to natively
>  +  manage and supervise all Ganeti processes.
>  +- Different types of compression can be applied during instance moves,
> including
>  +  user-specified ones.
>  +
>  +
> + Version 2.11.1
> + --------------
> +
> + *(Released Wed, 14 May 2014)*
> +
> + - Add design-node-security.rst to docinput
> + - kvm: use a dedicated QMP socket for kvmd
> +
> + Inherited from the 2.10 branch:
> +
> + - Set correct Ganeti version on setup commands
> + - Add a utility to combine shell commands
> + - Add design doc for performance tests
> + - Fix failed DRBD disk creation cleanup
> + - Hooking up verification for shared file storage
> + - Fix --shared-file-storage-dir option of gnt-cluster modify
> + - Clarify default setting of 'metavg'
> + - Fix invocation of GetCommandOutput in QA
> + - Clean up RunWithLocks
> + - Add an exception-trapping thread class
> + - Wait for delay to provide interruption information
> + - Add an expected block option to RunWithLocks
> + - Track if a QA test was blocked by locks
> + - Add a RunWithLocks QA utility function
> + - Add restricted migration
> + - Add an example for node evacuation
> + - Add a test for parsing version strings
> + - Tests for parallel job execution
> + - Fail in replace-disks if attaching disks fails
> + - Fix passing of ispecs in cluster init during QA
> + - Move QAThreadGroup to qa_job_utils.py
> + - Extract GetJobStatuses and use an unified version
> + - Run disk template specific tests only if possible
> +
> + Inherited from the 2.9 branch:
> +
> + - If Automake version > 1.11, force serial tests
> + - KVM: set IFF_ONE_QUEUE on created tap interfaces
> + - Add configure option to pass GHC flags
> ++>>>>>>> stable-2.11
>

Merge remnant?


> +
> +
>   Version 2.11.0
>   --------------
>
>

Reply via email to