• Petr Pudlak's avatar
    Merge branch 'stable-2.13' into stable-2.14 · 8d88f8fb
    Petr Pudlak authored
    * stable-2.13
      Full QuickCheck 2.7 compatibility
      QuickCheck 2.7 compatibility
      Bump revision number to 2.13.1
      Update NEWS file for the 2.13.1 release
    
    * stable-2.12
      Update design doc with solution for Issue 1094
      Prevent multiple communication nics for one instance
      Remove outdated reference to ganeti-masterd
      Update ganeti-luxid man page
      Add a man page for ganeti-wconfd
      Make htools tolerate missing "dtotal" and "dfree" on luxi
      Get QuickCheck 2.7 compatibility
      TestCommon: Fix QuickCheck import warnings
      Full QuickCheck 2.7 compatibility
      Add a CPP macro for checking the version of QuickCheck
      QuickCheck 2.7 compatibility
      Fix name of filter-evaluation function
      Call the filter again with runtime data this time
      Fix user and group ordering in test
    
    * stable-2.11
      Downgrade log-message for rereading job
      Dowgrade log-level for successful requests
    
    Conflicts:
    	Makefile.am
    	NEWS
    	configure.ac
    	lib/cmdlib/instance.py
    Resolutions:
    	Makefile.am: Remove the helper target hs-pkg-versions replaced
    	  by cabal in 2.14+
    	NEWS: Merge news from both branches
    	configure.ac: Keep 2.14 version
    	lib/cmdlib/instance.py: Propagate changes to
    	  lib/cmdlib/instance_create.py
    Signed-off-by: default avatarPetr Pudlak <pudlak@google.com>
    Reviewed-by: default avatarHrvoje Ribicic <riba@google.com>
    8d88f8fb
Query.hs 18.5 KB