Skip to content
  • Hrvoje Ribicic's avatar
    Merge branch 'stable-2.11' into master · dd6514c9
    Hrvoje Ribicic authored
    
    
    * stable-2.11
      (no changes)
    
    * stable-2.10
      Revision bump for 2.10.3
      Update NEWS file for 2.10.3
      Warn in UPGRADE about not tar'ing exported insts
      Fix non-running test and remove custom_nicparams rename
      Acccount for NODE_RES lock in opportunistic locking
      Fix request flooding of noded during disk sync
    
    * stable-2.9
      Allow QA asserts to produce more messages
      Add messages about skipped QA disk template tests
      Fix list-drbd QA test
      Update installation guide wrt to DRBD version
      Update NEWS for 2.9.6
      Revision bump for 2.9.6
    
    Conflicts:
    	qa/qa_utils.py: Taken more generic 2.10 functions
    
    Signed-off-by: default avatarHrvoje Ribicic <riba@google.com>
    Reviewed-by: default avatarKlaus Aehlig <aehlig@google.com>
    dd6514c9