Commit c75e0ff0 authored by Nigel Babu's avatar Nigel Babu
Browse files

Merge mozilla-central to fx-team, a=merge 

CLOSED TREE
parents fd0e35b9 68de837c

testing/mozharness/configs/hazards/build_b2g.py

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ config = { 
      'setup-analysis',

      'run-analysis',

      'collect-analysis-output',

      'upload-analysis',

      # Temporarily disabled - see bug 1211402

      #'upload-analysis',

      'check-expectations',

   ],

testing/mozharness/scripts/spidermonkey_build.py

+2 −1
Original line number Diff line number Diff line
@@ -115,7 +115,8 @@ class SpidermonkeyBuild(MockMixin, 
                                'setup-analysis',

                                'run-analysis',

                                'collect-analysis-output',

                                'upload-analysis',

                                # Temporary - see bug 1211402

                                #'upload-analysis',

                                'check-expectations',

                            ],

                            config={