• Petr Pudlak's avatar
    Merge branch 'stable-2.12' into stable-2.13 · 306a2aa9
    Petr Pudlak authored
    * 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
    
    * stable-2.11
      Downgrade log-message for rereading job
      Dowgrade log-level for successful requests
    
    Conflicts:
    	test/hs/Test/Ganeti/TestCommon.hs
    Resolution:
    	test/hs/Test/Ganeti/TestCommon.hs: keep additions from both
              versions
    Signed-off-by: default avatarPetr Pudlak <pudlak@google.com>
    Reviewed-by: default avatarKlaus Aehlig <aehlig@google.com>
    306a2aa9
design-node-security.rst 30.4 KB