commit e46b86f2e6060f4113a19f3b0d5785e5c7c5fc94
Merge: d7418ff 537126f
Author: Petr Pudlak <[email protected]>
Date:   Fri Aug 1 10:06:57 2014 +0200

    Merge branch 'stable-2.11' into stable-2.12
    
    * stable-2.11
      Postpone release of 2.11.4 by one day
      Remove known issues section for 2.11.4
      Add known issue to 2.11.4 NEWS file
      Bump version to 2.11.4
      Prepare NEWS file for 2.11.4
    
    * stable-2.10
      Add non-cherry-pickable changes related to state "rb----"
      Add Xen nothing state '------'
      Add Xen paused state as a Ganeti running state
      Update usage string for 'gnt-network connect'
    
    Conflicts:
        NEWS
        configure.ac
        lib/hypervisor/hv_xen.py
    Resolution:
      NEWS - include 2.11.4 description
      configure.ac - keep the 2.12 version
      lib/hypervisor/hv_xen.py - keep enhanced comments from 2.11

diff --cc NEWS
index 8cf1f55,29d883f..56be58c
--- a/NEWS
+++ b/NEWS
@@@ -2,76 -2,30 +2,100 @@@ New
  ====
  
  
 +Version 2.12.0 beta1
 +--------------------
 +
 +*(Released Mon, 21 Jul 2014)*
 +
 +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.
 +- Ganeti jobs now run as separate processes. The jobs are coordinated by
 +  a new daemon "WConfd" that manages cluster's configuration and locks
 +  for individual jobs. A consequence is that more jobs can run in parallel;
 +  the number is run-time configurable, see "New features" entry
 +  of 2.11.0. To avoid luxid being overloaded with tracking running jobs, it
 +  backs of and only occasionally, in a sequential way, checks if jobs have
 +  finished and schedules new ones. In this way, luxid keeps responsive under
 +  high cluster load. The limit as when to start backing of is also run-time
 +  configurable.
 +- The metadata daemon is now optionally available, as part of the
 +  partial implementation of the OS-installs design. It allows pass
 +  information to OS install scripts or to instances.
 +  It is also possible to run Ganeti without the daemon, if desired.
 +
 +New dependencies
 +~~~~~~~~~~~~~~~~
 +
 +- The KVM CPU pinning no longer uses the affinity python package, but psutil
 +  instead. The package is still optional and needed only if the feature is to
 +  be used.
 +
 +Known issues
 +~~~~~~~~~~~~
 +
 +The following issues are known to be present in the beta and will be fixed
 +before rc1:
 +
 +- Issue 881: Handle communication errors in mcpu
 +- Issue 883: WConfd leaks memory for some long operations
 +- Issue 884: Under heavy load the IAllocator fails with a "missing
 +  instance" error
 +- Issue 885: Network hotplugging on KVM sometimes makes an instance
 +  inresponsive
 +
 +
+ Version 2.11.4
+ --------------
+ 
+ *(Released Thu, 31 Jul 2014)*
+ 
+ - Improved documentation of the instance shutdown behavior.
+ 
+ Inherited from the 2.10 branch:
+ 
+ - KVM: fix NIC configuration with absent NIC VLAN (Issue 893)
+ - Adapt relative path expansion in PATH to new environment
+ - Exclude archived jobs from configuration backup
+ - Expose early_release for ReplaceInstanceDisks
+ - Add backup directory for configuration backups for upgrades
+ - Fix BlockdevSnapshot in case of non lvm-based disk
+ - Improve RAPI error handling for queries in non-existing items
+ - Allow disk hot-remove even with chroot or SM
+ - Remove superflous loop in instance queries (Issue 875)
+ 
+ Inherited from the 2.9 branch:
+ 
+ - Make ganeti-cleaner switch to save working directory (Issue 880)
+ 
+ 
  Version 2.11.3
  --------------
  

Reply via email to