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)
commitdd84e7157c1c855a948b1651d22ded8e4c6452e1
tree9afbda4db29c4e245b752a3db9bfe24c8a69389b
parent6869f673b058cc58cf4b7a023f0220d0d047de55
parent125e1230880fad8f29f57446cc7bbccfad73a953
Merge branch 'stable-2.8' into stable-2.9

* 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>
src/Ganeti/Daemon.hs