[tracker-miners: 4/4] Merge branch 'wip/carlosg/timeouts-and-stuff' into 'master'

[Sam Thursfield <sthursfield src gnome org>]

commit 5ff382624f0cacbc3363873cc75c91c5d522bf03
Merge: 747f0acc2 7e804a0c6
Author: Sam Thursfield <sam afuera me uk>
Date:   Fri Jul 3 13:40:49 2020 +0000

    Merge branch 'wip/carlosg/timeouts-and-stuff' into 'master'
    
    Fixes for race conditions
    
    See merge request GNOME/tracker-miners!232

 src/libtracker-miner/tracker-file-notifier.c | 29 +++++++++++++---------------
 src/miners/fs/tracker-main.c                 |  3 +++
 src/miners/rss/tracker-main.c                |  1 +
 src/tracker-extract/tracker-main.c           |  2 ++
 4 files changed, 19 insertions(+), 16 deletions(-)
---