Merge branch 'staging' into production

mozilla · Jan 8, 2013 · 3ee2ad1 · 3ee2ad1
2 parents 7bc4b7a + 69c3d23
commit 3ee2ad1
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/config/ondemand/functional-all.ini b/config/ondemand/functional-all.ini
@@ -31,7 +31,7 @@ platform=win32
 8.0=en-US
 
 [windows 7 64bit]
-platform=win64
+platform=win32
 8.0=en-US
 
 [windows vista 32bit]

diff --git a/config/production/daily.json b/config/production/daily.json
@@ -99,7 +99,6 @@
             },
             "mozilla-aurora": {
                 "testruns": [
-                    "update",
                     "functional",
                     "endurance",
                     "remote",

diff --git a/config/staging/daily.json b/config/staging/daily.json
@@ -87,7 +87,6 @@
             },
             "mozilla-aurora": {
                 "testruns": [
-                    "update",
                     "functional",
                     "endurance",
                     "remote",