Merge mozilla-inbound to mozilla-central r=merge a=merge
authorCosmin Sabou <csabou@mozilla.com>
Mon, 18 Dec 2017 11:46:13 +0200
changeset 396679 3a842d55ff1f
parent 396677 e72be4397ade (current diff)
parent 396678 baa80d498eff (diff)
child 396680 5572465c08a9
push id33106
push usercsabou@mozilla.com
push date2017-12-18 09:46 +0000
treeherdermozilla-central@3a842d55ff1f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge, merge
milestone59.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge mozilla-inbound to mozilla-central r=merge a=merge
--- a/testing/profiles/prefs_general.js
+++ b/testing/profiles/prefs_general.js
@@ -384,12 +384,13 @@ user_pref("extensions.formautofill.avail
 // Disable all recommended Marionette preferences for Gecko tests.
 // The prefs recommended by Marionette are typically geared towards
 // consumer automation; not vendor testing.
 user_pref("marionette.prefs.recommended", false);
 
 // Disable Screenshots by default for now
 user_pref("extensions.screenshots.disabled", true);
 
-// Set places maintenance far in the future to avoid it kicking in during tests.
-// The maintenance can take a relatively long time which may cause unnecessary
-// intermittents and slow down tests.
-user_pref("places.database.lastMaintenance", 7258114800);
+// Set places maintenance far in the future (the maximum time possible in an
+// int32_t) to avoid it kicking in during tests. The maintenance can take a
+// relatively long time which may cause unnecessary intermittents and slow down
+// tests. This, like many things, will stop working correctly in 2038.
+user_pref("places.database.lastMaintenance", 2147483647);