From c8885211cecd9f8a6b99fa0a3595d56e74465301 Mon Sep 17 00:00:00 2001 From: Kit Cambridge Date: Thu, 27 Jul 2017 16:07:14 -0700 Subject: [PATCH] Bug 1385127 - Enable bookmark validation on early Beta. r=markh MozReview-Commit-ID: h1ps0YebkW --HG-- extra : rebase_source : 76f35b04fd37fbed82f483e526194e8a1a7623ea --- services/sync/services-sync.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/services/sync/services-sync.js b/services/sync/services-sync.js index f6e73f58b784..00c1daa830ff 100644 --- a/services/sync/services-sync.js +++ b/services/sync/services-sync.js @@ -82,10 +82,15 @@ pref("services.sync.fxa.privacyURL", "https://accounts.firefox.com/legal/privacy pref("services.sync.telemetry.submissionInterval", 43200); // 12 hours in seconds pref("services.sync.telemetry.maxPayloadCount", 500); -#ifndef RELEASE_OR_BETA -// Enable the (fairly costly) client/server validation on nightly/aurora only. +#ifdef EARLY_BETA_OR_EARLIER +// Enable the (fairly costly) client/server validation through early Beta, but +// not release candidates or Release. pref("services.sync.engine.bookmarks.validation.enabled", true); -// Enable repair of bookmarks - requires validation also be enabled. +#endif + +#if defined(NIGHTLY_BUILD) +// Enable repair of bookmarks on Nightly only - requires validation also be +// enabled. pref("services.sync.engine.bookmarks.repair.enabled", true); #endif