projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: aff49a1 07c7c94)
Merge branch 'devel-2.6' into stable-2.6
authorIustin Pop <iustin@google.com>
Wed, 23 May 2012 11:53:58 +0000 (13:53 +0200)
committerIustin Pop <iustin@google.com>
Wed, 23 May 2012 12:03:07 +0000 (14:03 +0200)
commit106ee6977cb7ada5c6d0c0a8cc45afc841e5fa79
treed8aad6876a6a2eaaf94918f542a2c7f23fe8ded7tree | snapshot
parentaff49a15a7ecf3be1d3b1c2ebfe18d7e48924601commit | diff
parent07c7c94a75c227cfc50bd665e9d29b5873716937commit | diff
Merge branch 'devel-2.6' into stable-2.6

It seems Michael submitted the daemon-util patch on devel-2.6, and I
didn't realise it. It's way too early in the release cycle of 2.6 to
have diverging branches, so I'm merging devel-2.6 into stable-2.6 and
then will ff the devel branch to the merge point.

* origin/devel-2.6:
  Add support to daemon-util for distributions without start-stop-daemon

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.