| commit | 957e9b0278a8ea2add0ccdc08876c61e4a2178d1 | |
| author | Douglas Bagnall <douglas.bagnall@catalyst.net.nz> | |
| Wed, 10 Jun 2015 04:01:52 +0000 (10 16:01 +1200) | ||
| committer | Andrew Bartlett <abartlet@samba.org> | |
| Fri, 12 Jun 2015 04:57:17 +0000 (12 06:57 +0200) | ||
| tree | 1f66e0fe7a2f191136d1ceeafb639976baaec50c | treesnapshot (tar.gz zip) |
| parent | d662cc7519c0244eef6cc1f1b38ed2d7c11929f2 | commitdiff |
KCC: combine_repl_info() returns the combined replinfo
Previously it returned False if there was no intersections (i.e,
the new repl_info duration was 0). Now the same check can be performed
by checking the duration directly.
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Conflicts:
python/samba/kcc/graph.py
Previously it returned False if there was no intersections (i.e,
the new repl_info duration was 0). Now the same check can be performed
by checking the duration directly.
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Conflicts:
python/samba/kcc/graph.py
| python/samba/kcc/graph.py | diffblobblamehistory |