Merge branch 'master' into global-filters

treeherder/model/sql/jobs.json

@@ -194,9 +194,11 @@
                     bp.`os_name` as build_os,
                     bp.`architecture` as build_architecture,
                     m.`name` as machine_name,
+                    m.`id` as machine_id,
                     jt.`name` as job_type_name,
                     jt.`symbol` as job_type_symbol,
                     jt.`description` as job_type_description,
+					jt.id as job_type_id,
 					jg.`name` as job_group_name,
                     jg.`symbol` as job_group_symbol,
                     jg.`description` as job_group_description,

treeherder/webapp/api/utils.py

@@ -34,7 +34,9 @@ class UrlQueryFilter(object):
         "lt": "<",
         "lte": "<=",
         "=": "=",
-        "in": "IN"
+        "in": "IN",
+        "ne": "<>",
+        "nin": "NOT IN"
     }
 
     splitter = "__"
@@ -47,7 +49,7 @@ class UrlQueryFilter(object):
                 field, operator = k.split(self.splitter, 1)
                 if operator not in self.operators:
                     raise ValueError("{0} is not a supported operator".format(operator))
-                if operator == "in":
+                if operator in ("in", "nin"):
                     v = tuple(v.split(","))
             else:
                 field = k