« Previous | Next » 

Revision 42e85303

ID42e853034c7e837933de0c18c67e5002a7075998
Parent f89ec0e0, 08d58f4c
Child 922a9e65

Added by Klaus Aehlig over 7 years ago

Merge branch 'stable-2.9' into master

  • 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: Klaus Aehlig <>
Reviewed-by: Thomas Thrainer <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted