projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: aa112e9 8f467ab)
Merge branch 'stable-2.9' into stable-2.10
authorKlaus Aehlig <aehlig@google.com>
Tue, 20 May 2014 14:19:11 +0000 (16:19 +0200)
committerKlaus Aehlig <aehlig@google.com>
Tue, 20 May 2014 14:22:22 +0000 (16:22 +0200)
commitc4460a469b0aa0d6234d11780dadde4aa072037e
tree1435a7abfb33531c58dd82b359a62d016928b13btree | snapshot
parentaa112e9f1c0d06ff7d8481adb61dbb314f99ff3ecommit | diff
parent8f467ab0c11f539932a0d41ef322873f2366c724commit | diff
Merge branch 'stable-2.9' into stable-2.10

* stable-2.9
  Improve haskell style
  check-man-warnings: use C.UTF-8 and set LC_ALL
  Fix passing of ispecs in cluster init during QA

Conflicts:
src/Ganeti/Monitoring/Server.hs: trivial

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Helga Velroyen <helgav@google.com>
src/Ganeti/Monitoring/Server.hs diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.