• Hrvoje Ribicic's avatar
    Merge branch 'stable-2.13' into stable-2.14 · fe39b63b
    Hrvoje Ribicic authored
    * stable-2.13
      Change wording in documentation wrt configure-time paths
      Do not distribute files with configure-specific information
      LXC: Add udevadm settle invocation to prevent errors
    
    * stable-2.12
      QA: Fix CheckFileUnmodified to work with vcluster
      QA: Fix white-spaces in CheckFileUnmodified
      QA: Check that the cluster verify doesn't change the config
      QA: Allow to check that an operation doesn't change a file
      Use only shared configuration lock for ComputeDRBDMap
      Only assert properties of non-None objects
      If any IO error happens during job forking, retry
      Add a function for retrying `MonadError` computations
      Annotate every send/receive operation in Exec.hs
      Refactor `rethrowAnnotateIOError` and simplify its usage
      Query.Exec: Describe error if talking to job process fails
      Query.Exec: Log error when talking to job process fails
      Fix the generation of Makefile.ghc rules for *_hi
      Fix error handling for failed fork jobs
      If a forked job process malfunctions, kill it thoroughly
      Add function to run checked computations in `MonadError`
      Add job ID and process ID to log statements in Exec.hs
    
    * stable-2.11
      Improve speed of Xen hypervisor unit tests
      Improve Xen instance state handling
      Renew crypto retries for non-master nodes
      Retries for the master's SSL cert renewal
      Unit tests for offline nodes
      De-duplicate testing code regarding pathutils
      Make LURenewCrypto handle unreachable nodes properly
      Error handling on failed SSL cert renewal for master
      Unit test for LURenewCrypto's valid case
      Mock support for pathutils
      Increase timeout of crypto token RPC
    
    * stable-2.10
      Make QA fail if KVM hotplugging fails
      Always preserve QA command output
      Don't lose stdout/stderr in AssertCommand
      qa_utils: Allow passing fail=None to AssertCommand
      qa_utils: Make AssertCommand return stdout/stderr as well
      Allow plain/DRBD conversions regardless of lack of disks
      Add support for ipolicy modifications to mock config
    
    Conflicts:
    	lib/cmdlib/cluster/verify.py
    	lib/cmdlib/instance.py
    	lib/config/__init__.py
    	qa/qa_utils.py
    Resolution:
            verify.py: Merge renew-crypto changes in manually.
            instance.py: Remove fixes for DRBD->plain conversion as
              instances with no disks belong to the diskless template
              implicitly as of 2.14.
            __init__.py: Keep lock shared, rename decorator.
            qa_utils.py: Take 2.10 changes.
    Signed-off-by: default avatarHrvoje Ribicic <riba@google.com>
    Reviewed-by: default avatarHelga Velroyen <helgav@google.com>
    fe39b63b
rpc_defs.py 30.6 KB