« Previous | Next » 

Revision bccc3658

IDbccc3658438b6016213aa83bc9c24aca9fd517ae
Parent 9571c499, 70000149
Child bd5b2991, 306a3845

Added by Thomas Thrainer almost 10 years ago

Merge branch 'stable-2.10' into stable-2.11

  • stable-2.10
    Postpone 2.10.4 release to May 15th
    Don't fail QA if submitting a job takes too long
    Revision bump for the 2.10.4 release
    Prepare NEWS file for 2.10.4 release
  • stable-2.9
    On expanding jobs, extend reason trail
    Add LC_ALL=en_US.UTF-8 before running check-man-warnings

Conflicts:
NEWS (take both additions)
configure.ac (take the stable-2.11 version)
lib/mcpu.py (take reason trail handling from stable-2.9)

Signed-off-by: Thomas Thrainer <>
Reviewed-by: Helga Velroyen <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted