projects / ganeti-local / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6869f67 125e123)
Merge branch 'stable-2.8' into stable-2.9
authorThomas Thrainer <thomasth@google.com>
Tue, 20 Aug 2013 12:20:52 +0000 (14:20 +0200)
committerThomas Thrainer <thomasth@google.com>
Tue, 20 Aug 2013 12:48:33 +0000 (14:48 +0200)
* stable-2.8
  Allow instance mods if only osparams are given
  Fix harep manpage title
  Use FQDN to check master node status

Signed-off-by: Thomas Thrainer <thomasth@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

1  2 
src/Ganeti/Daemon.hs patch | diff1 | diff2 | blob | history

diff --cc src/Ganeti/Daemon.hs
Simple merge
Unnamed repository; edit this file 'description' to name the repository.