Skip to content
  • Klaus Aehlig's avatar
    Merge branch 'stable-2.11' into stable-2.12 · 073864cb
    Klaus Aehlig authored
    
    
    * stable-2.11
      Update configure file to version 2.11.7
      Update NEWS file for 2.11.7 release
      Add logging to RenewCrypto
      Fix format string for gnt-network info
      Replace textwrapper.wrap by a custom version for networks
      Add SSL improvements to NEWS file
    
    * stable-2.10
      Update tag limitations
      Fix typos in doc/design-storagetypes.rst
      Make getFQDN prefer cluster protocol family
      Add version of getFQDN accepting preferences
      Make getFQDN honor vcluster
    
    Conflicts:
    	NEWS: take all release entries
    	configure.ac: ignore revision bump
    	lib/cmdlib/cluster.py: manually apply 2.11 changes to 2.12
    	src/Ganeti/Daemon.hs: trivial
    
    Signed-off-by: default avatarKlaus Aehlig <aehlig@google.com>
    Reviewed-by: default avatarPetr Pudlak <pudlak@google.com>
    073864cb