[Pkg-samba-maint] [samba] 01/01: Merge support for upstart jobs

[Steve Langasek]

On Wed, Aug 14, 2013 at 11:41:34PM +0000, Steve Langasek wrote:
> This is an automated email from the git hooks/post-receive script.

> vorlon pushed a commit to branch master
> in repository samba.

> commit 49a1d61ac3ab702e0fd65c8535bd1a74ee419035
> Merge: 9afd003 133bcf4
> Author: Steve Langasek <steve.langasek at canonical.com>
> Date:   Mon Aug 12 07:40:33 2013 +0200

>     Merge support for upstart jobs

Oops, sorry - I didn't mean to push this to master, I was still discussing
this change with Ivo and was only meaning to push what we'd discussed to the
init-script-split-and-upstart-jobs branch for further review.  But now that
it's wound up on master, I've gone ahead and pushed the rest of it. :P

I think this gives us consistent smbd,nmbd init scripts plus a samba init
script which is a wrapper around them that is both compatible with the
previous incarnation and provides a suitable base for wrapping the smbd vs. 
samba-ad-dc use cases.  Let's discuss this more at the samba BoF today at
DebConf.

(Also, I haven't yet implemented the same wrapper for upstart... but I
assume that's my responsibility anyway, and no one other than me will be
annoyed that this has landed before we're interface-compatible between
upstart and sysvinit ;)

-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
slangasek at ubuntu.com                                     vorlon at debian.org