ready to merge trunk over SAMBA_3_0 ?

[Andrew Bartlett]

On Tue, 2006-01-31 at 16:49 -0500, simo wrote:
> On Tue, 2006-01-31 at 14:15 -0600, Gerald (Jerry) Carter wrote:
> > -----BEGIN PGP SIGNED MESSAGE-----
> > Hash: SHA1
> > 
> > Everyone,
> > 
> > Now that 3.0.21b has shipped, I'm ready to merge trunk
> > over top of SAMBA_3_0 to get more testing for the new code
> > that's been checked in.  Are there any objections?  Are
> > there any known issues in trunk at the moment?
> 
> What about the new release?
> Have you decided between 3.0.22 and 3.2.0 ?

Also, is there a sane SVN way to do the merge, so we keep history?

Andrew Bartlett

-- 
Andrew Bartlett                                http://samba.org/~abartlet/
Authentication Developer, Samba Team           http://samba.org
Student Network Administrator, Hawker College  http://hawkerc.net
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : http://lists.samba.org/archive/samba-technical/attachments/20060201/2d7ca5ab/attachment.bin