Please pull into v3-2-0-stable - Samba

This is a discussion on Please pull into v3-2-0-stable - Samba ; commit f62909d2b457f3494c9536c994a9209f8cc0c331 Author: John H Terpstra Date: Thu Jun 19 16:11:31 2008 -0500 Fixing net help info. commit a9994d4a18f8130525c56a0a946ad1ff3c11696a Merge: 8462148... 24730f5... Author: John H Terpstra Date: Thu Jun 19 11:12:17 2008 -0500 Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test ...

+ Reply to Thread
Results 1 to 3 of 3

Thread: Please pull into v3-2-0-stable

  1. Please pull into v3-2-0-stable

    commit f62909d2b457f3494c9536c994a9209f8cc0c331
    Author: John H Terpstra
    Date: Thu Jun 19 16:11:31 2008 -0500

    Fixing net help info.

    commit a9994d4a18f8130525c56a0a946ad1ff3c11696a
    Merge: 8462148... 24730f5...
    Author: John H Terpstra
    Date: Thu Jun 19 11:12:17 2008 -0500

    Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test

    ----------------
    Karolin,

    I hope this is correct info - I had done a few patches but did not previously
    do a git-push. I hope this does not mess anything up.

    - John T.


  2. Re: Please pull into v3-2-0-stable

    Hi John,

    On Thu, Jun 19, 2008 at 04:55:17PM -0500, John H Terpstra wrote:
    > I hope this is correct info - I had done a few patches but did not previously
    > do a git-push. I hope this does not mess anything up.


    I pushed the first one, but I have to take a closer look at the second
    one. Please give me few days. Thanks!

    Karolin

    --
    SerNet GmbH, Bahnhofsallee 1b, 37081 G÷ttingen
    phone: +49-551-370000-0, fax: +49-551-370000-9
    AG G÷ttingen, HRB 2816, GF: Dr. Johannes Loxen
    http://www.SerNet.DE, mailto: Info @ SerNet.DE


  3. Re: Please pull into v3-2-0-stable

    John,

    On Do, Jun 19, 2008 at 04:55:17 -0500, John H Terpstra wrote:
    > commit f62909d2b457f3494c9536c994a9209f8cc0c331
    > Author: John H Terpstra
    > Date: Thu Jun 19 16:11:31 2008 -0500
    >
    > Fixing net help info.
    >
    > commit a9994d4a18f8130525c56a0a946ad1ff3c11696a
    > Merge: 8462148... 24730f5...
    > Author: John H Terpstra
    > Date: Thu Jun 19 11:12:17 2008 -0500
    >
    > Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
    >
    > ----------------


    I picked up

    -b96c9d54 Fixed publishing date info
    -5035311a Added TDB File documentation requested by some users
    -3a8ea6be Clarification that hosts resolution is done by winbind...
    -2a953d6b Clarification that hosts resolution is done by winbind...

    instead of the proposed merge commit.

    I think that was your intention, right?

    Karolin

    --
    SerNet GmbH, Bahnhofsallee 1b, 37081 G├Âttingen
    phone: +49-551-370000-0, fax: +49-551-370000-9
    AG G├Âttingen, HRB 2816, GF: Dr. Johannes Loxen
    http://www.SerNet.DE, mailto: Info @ SerNet.DE


    -----BEGIN PGP SIGNATURE-----
    Version: GnuPG v2.0.4-svn0 (GNU/Linux)

    iD8DBQFIX2I3KGi9fisXk1ERAoDqAJ9Ea/a4oz8kjQ6JZFlUjdovO8YaUwCfUwyJ
    VRlkVVajt8+QrsP5YTnQkwo=
    =ZHSy
    -----END PGP SIGNATURE-----


+ Reply to Thread