« Previous | Next » 

Revision 626f4e45

ID626f4e45536e1c6255f87255c268c241e04d7890

Added by Guido Trotter almost 12 years ago

Merge branch 'stable-2.1'

  • stable-2.1:
    Bump up version for the 2.1.4 release
    Update NEWS about the latest 2.1 change
    Fix handling of errors from socket.gethostbyname
    Update a comment in qa-sample.json
    RAPI client: Add support for Python 2.6
    Update NEWS for Ganeti 2.1.4

Conflicts:
NEWS: keep both
configure.ac: keep the 2.2 version
qa/qa-sample.json: merge nearby changes

Signed-off-by: Guido Trotter <>
Reviewed-by: Michael Hanselmann <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted