projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 51b1269 788529f)
Merge branch 'stable-2.7' into stable-2.8
authorKlaus Aehlig <aehlig@google.com>
Fri, 5 Jul 2013 08:44:06 +0000 (10:44 +0200)
committerKlaus Aehlig <aehlig@google.com>
Fri, 5 Jul 2013 10:03:56 +0000 (12:03 +0200)
commit5ab57a1ee6c7e251d24260443440fff3e7fcbbf8
tree2b67860cce3de5aa6ff59d02a206e19b7ae0f478tree | snapshot
parent51b1269547659b8cb85d6b318d4dea0b25036dd1commit | diff
parent788529f2d64d9e02dad88269492802cf28249f10commit | diff
Merge branch 'stable-2.7' into stable-2.8

* stable-2.7:
  Release version 2.7.0
  Fix "instance replace" typo in admin.rst
  Fix typo in the install guide
  Disable pylint E1101 on hypothetical import

Conflicts:
NEWS: trivial
configure.ac: trivial

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
NEWS diff1 | diff2 | blob | history
doc/admin.rst diff1 | diff2 | blob | history
doc/install.rst diff1 | diff2 | blob | history
lib/netutils.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.