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

CLOSED TREE
This commit is contained in:
Nigel Babu 2015-10-21 11:09:36 +05:30
commit b5c9a017ed
2 changed files with 4 additions and 2 deletions

View File

@ -14,7 +14,8 @@ config = {
'setup-analysis',
'run-analysis',
'collect-analysis-output',
'upload-analysis',
# Temporarily disabled - see bug 1211402
#'upload-analysis',
'check-expectations',
],

View File

@ -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={