Skip to content
  • Klaus Aehlig's avatar
    Merge branch 'stable-2.8' into stable-2.9 · f148fe23
    Klaus Aehlig authored
    
    
    * stable-2.8
      Add function to unwrap Results logging failures
      Make the DRBD collector more failure-resilient
      Prepare GetLinuxNodeInfo for testing
      Add unit test for GetLinuxNodeInfo
      NEWS update and version bump for 2.8 rc2
    
    Conflicts:
    	Makefile.am
    	NEWS
    	configure.ac
    	lib/hypervisor/hv_base.py
    
    For hv_base.py, take the changes of stable-2.8, for
    configure.ac take the version of stable-2.9, for the
    rest, take both additions.
    
    Signed-off-by: default avatarKlaus Aehlig <aehlig@google.com>
    Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
    f148fe23