projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 43c16a8 a1cef55)
Merge branch 'stable-2.6'
authorIustin Pop <iustin@google.com>
Tue, 29 May 2012 15:12:03 +0000 (17:12 +0200)
committerIustin Pop <iustin@google.com>
Wed, 30 May 2012 08:31:29 +0000 (10:31 +0200)
commit4a78c361a6de3bcbf98f02abfe41ae3b11de2b00
tree284a0938bb6060e3ac928e83b819d8acdadac147tree | snapshot
parent43c16a8a1adfd543751fcaf60ad4c8e04cf83688commit | diff
parenta1cef5527ea48393bf421e17b7b5d2ae6f281408commit | diff
Merge branch 'stable-2.6'

* stable-2.6:
  Document that the disk/hypervisor state is not used
  Correct the watcher state files in the man page
  Re-wrap some lines in watcher code
  Add support for SIGHUP handling in Haskell daemons
  Rework logging setup for Haskell daemons
  Adapt example init.d script to work on Fedora
  Update the INSTALL doc for Fedora users
  kvm-ifup: Use /bin/bash

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: René Nussbaumer <rn@google.com>
Unnamed repository; edit this file 'description' to name the repository.