« Previous | Next » 

Revision d7772efa

IDd7772efa2d67eedc90795623e90d51e017471a03
Parent b498540e, a13d6911
Child c1513c7f

Added by Iustin Pop about 10 years ago

Merge branch 'stable-2.5' into stable-2.6

  • stable-2.5:
    Fix parallel build failures
    QA: Add default setting for tests

Conflicts:
Makefile.am (expected, from the parallel build fixes)
qa/qa_config.py (due to cherry-pick, ignored, simply checkout out with --ours)

Signed-off-by: Iustin Pop <>
Reviewed-by: Michael Hanselmann <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted