Merge remote branch 'origin/upstream' into tempbranch

frontend/tko/models.py

 from django.db import models as dbmodels, connection
 from django.utils import datastructures
 from autotest_lib.frontend.afe import model_logic, readonly_connection
 
 _quote_name = connection.ops.quote_name
 
 class TempManager(model_logic.ExtendedManager):
     _GROUP_COUNT_NAME = 'group_count'
 
     def _get_key_unless_is_function(self, field):
@@ skipping 215 matching lines @@
 
     class Meta:
         db_table = 'tko_iteration_attributes'
 
 
 class IterationResult(dbmodels.Model, model_logic.ModelExtensions):
     # see comment on IterationAttribute regarding primary_key=True
     test = dbmodels.ForeignKey(Test, db_column='test_idx', primary_key=True)
     iteration = dbmodels.IntegerField()
     attribute = dbmodels.CharField(max_length=90)
-    value = dbmodels.DecimalField(null=True, max_digits=12, decimal_places=31,
-                                  blank=True)
+    value = dbmodels.FloatField(null=True, blank=True)
 
     objects = model_logic.ExtendedManager()
 
     class Meta:
         db_table = 'tko_iteration_result'
 
 
 class TestLabel(dbmodels.Model, model_logic.ModelExtensions):
     name = dbmodels.CharField(max_length=80, unique=True)
     description = dbmodels.TextField(blank=True)
@@ skipping 438 matching lines @@
                       apply_presentation=True):
         if initial_query is None:
             initial_query = cls.objects.get_query_set_with_joins(filter_data)
         return super(TestView, cls).query_objects(
                 filter_data, initial_query=initial_query,
                 apply_presentation=apply_presentation)
 
 
     class Meta:
         db_table = 'tko_test_view_2'