On (11/11/15 18:13), Jakub Hrozek wrote:
On Wed, Nov 11, 2015 at 05:53:15PM +0100, Michal Židek wrote:
> ACK to all.
>
> CI link:
>
http://sssd-ci.duckdns.org/logs/job/32/83/summary.html
>
> These patches are required before Nick's LDAP tests
> can be pushed (so that we can push them without the
> workaround for failing memcache tests). I tested them
> together.
Pushed to master:
* 782d39e3916d16b8dbba6ae97aca1db2f3c35d76
* b28f5fb097e06a97a45e0ae348e506d9d1432cc8
* c269ca2669706bddb25c5938b50277b0c0a94ea4
* d4ff84434265dc959098ccfd4e8cd5d61d9052c9
It would be nice to have the same fixes in sssd-1-13 as well, can you
send a set that applies atop sssd-1-13?
The conflict was caused by missing test src/tests/intg/test_local_domain.py.
https://fedorahosted.org/sssd/ticket/2785
This integration test is only in master branch.
I resolved the "conflicts" and pushed to
sssd-1-13:
* c54c097445cdcbc2774c97a18549d516fc0b63cb
* 87af3a1e57e8ddbffe847748b170a9a4f2ac8c1e
* e360fa6e91ee3500435e85b9c51c4932d2b99f33
* 01c888be345ed8e77d97a83ed0bf4f57b3e5c740
LS