Last set of subunit2 patches

Andrew Bartlett abartlet at samba.org
Sun Nov 23 23:01:30 MST 2014


On Sat, 2014-11-15 at 19:16 +0000, Jelmer Vernooij wrote:
> Hi Andrew,
> 
> The attached patches fix the last issue with my subunit2 branch. I'm just
> sending the patches you haven't reviewed earlier; the previous ones are unchanged.
> 
> In addition to making sure we always use a testtools/subunit2 combination that is
> valid, this moves the remaining python modules from lib/ to third_party/.
> 
> The complete branch can also be found as 'for-review/subunit2' at
> git://git.samba.org/jelmer/samba.git.
> 
> Cheers,

Jelmer,

Can you help me get these onto current master?  I'm getting odd
conflicts trying to rebase this, yet can't see what it is conflicting
with.

Thanks,

Andrew Bartlett


-- 
Andrew Bartlett
http://samba.org/~abartlet/
Authentication Developer, Samba Team  http://samba.org
Samba Developer, Catalyst IT          http://catalyst.net.nz/services/samba






More information about the samba-technical mailing list