Merge "Use mergedafter and mergedbefore Gerrit filters"

openstack_election/check_candidacy.py

@@ -58,7 +58,7 @@ def check_candidate(project_name, email, projects, limit=1, verbose=0):
 
         for deliverable in project['deliverables'].values():
             for repo_name in deliverable["repos"]:
-                query = ('is:merged after:"%s" before:"%s" '
+                query = ('is:merged mergedafter:"%s" mergedbefore:"%s" '
                          'owner:%s project:%s' %
                          (utils.gerrit_datetime(timeframe['start']),
                           utils.gerrit_datetime(timeframe['end']),

openstack_election/owners.py

@@ -189,7 +189,9 @@ def main(options):
     # The query identifying relevant changes
     match = 'status:merged'
     if after:
-        match = '%s after:"%s"' % (match, after)
+        match = '%s mergedafter:"%s"' % (match, after)
+    if before:
+        match = '%s mergedbefore:"%s"' % (match, before)
     if sieve:
         match = '%s %s' % (match, sieve)