commit 2f4c6319af5df124ad0bb83c72609c9593247d01
Merge: afbf6ef b03cd9d
Author: Klaus Aehlig <[email protected]>
Date:   Thu Nov 12 11:45:16 2015 +0100

    Merge branch 'stable-2.14' into stable-2.15
    
    * stable-2.14
      Fix faulty iallocator type check
      Improve cfgupgrade output in case of errors
    
    * stable-2.13
      Extend timeout for gnt-cluster renew-crypto
      Reduce flakyness of GetCmdline test on slow machines
      Remove duplicated words
    
    * stable-2.12
      Revert "Also consider connection time out a network error"
      Clone lists before modifying
      Make lockConfig call retryable
      Return the correct error code in the post-upgrade script
      Make openssl refrain from DH altogether
      Fix upgrades of instances with missing creation time
    
    * stable-2.11
      (no changes)
    
    * stable-2.10
      Remove -X from hspace man page
      Make htools tolerate missing "dtotal" and "dfree" on luxi
    
    Signed-off-by: Klaus Aehlig <[email protected]>


-- 
Klaus Aehlig
Google Germany GmbH, Dienerstr. 12, 80331 Muenchen
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschaeftsfuehrer: Matthew Scott Sucherman, Paul Terence Manicle

Reply via email to