Skip to content
Snippets Groups Projects
  1. Jun 23, 2010
  2. Jun 22, 2010
  3. Jun 21, 2010
  4. Jun 18, 2010
    • Guido Trotter's avatar
      Merge branch 'stable-2.1' · 626f4e45
      Guido Trotter authored
      
      * 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: default avatarGuido Trotter <ultrotter@google.com>
      Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
      626f4e45
Loading