« Previous | Next » 

Revision 8f4dc996

ID8f4dc9966ae727aadcfb6ccbc56f75dfc14dbfb8
Parent a5265758, aff02701
Child db176d44

Added by Klaus Aehlig almost 10 years ago

Merge branch 'stable-2.12' into master

  • stable-2.12
    Make upgrade more robust
    Fix order in downgrades
    Simplify cleanup of locks
    Handle lock addition as lock acquisitions

Conflicts:
tools/cfgupgrade: ignore downgrade instructions
from 2.12

Signed-off-by: Klaus Aehlig <>
Reviewed-by: Petr Pudlak <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted