Skip to content
  • Klaus Aehlig's avatar
    Merge branch 'stable-2.9' into master · 42e85303
    Klaus Aehlig authored
    
    
    * stable-2.9
      Including missing RST files in packaging
      Update supported lint tools version numbers
      Fix some wrong indentations in the code
      Disable parenthesis indentation check
      Fix an improperly escaped string
      Make QaConfig a proper container
      Make QmpMessage a proper container
      Prevent static field checking for dynamic classes
      Fix metaclasses support in recent pylint versions
    
    * stable-2.8
      Add additional tests for utils.Retry
      Make retry tests independent of actual time
      Fix corner-case in handling of remaining retry time
      Perform proper cleanup on termination of Haskell daemons
    
    Conflicts:
    	Makefile.am
    	doc/devnotes.rst
    In doc/devnotes.rst, take version updates from
    stable-2.9 while keeping the addition of mock
    from master. In Makefile.am take both additions.
    
    Signed-off-by: default avatarKlaus Aehlig <aehlig@google.com>
    Reviewed-by: default avatarThomas Thrainer <thomasth@google.com>
    42e85303