Merge branch 'devel-2.4'
authorMichael Hanselmann <hansmi@google.com>
Mon, 25 Jul 2011 13:02:23 +0000 (15:02 +0200)
committerMichael Hanselmann <hansmi@google.com>
Mon, 25 Jul 2011 13:06:56 +0000 (15:06 +0200)
* devel-2.4:
  Reopen daemon's stdio on SIGHUP
  Reopen log file only once after SIGHUP
  Don't leak file descriptors when setting up daemon output
  Fix aliases in bash completion

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>

1  2 
Makefile.am
lib/utils/log.py
lib/utils/process.py

diff --cc Makefile.am
Simple merge
Simple merge
Simple merge