« Previous | Next » 

Revision 230bc94a

ID230bc94a90331fe071f10ea234a4e6e13f5d4f69
Parent 9f8e85c6, edada04b
Child 2f523522

Added by Klaus Aehlig over 7 years ago

Merge branch 'stable-2.9' into master

  • stable-2.9
    Fix incorrect conflict resolution in lib/cmdlib/instance.py
  • stable-2.8
    Version bump for 2.8 rc3
    Add a default to file-driver when unspecified over RAPI
    Remove typo from RAPI documentation
    Describe the files in doc/users in NEWS
    Update the upgrade procedure
  • stable-2.7
    Fix incorrect manpage reference to htools

Conflicts (trivial):
lib/cmdlib/instance.py

Signed-off-by: Klaus Aehlig <>
Reviewed-by: Michele Tartara <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted