From ae75a54251e4b147a0d9a4409a0dd814b43d8128 Mon Sep 17 00:00:00 2001 From: Hugo Gruson Date: Sun, 29 Oct 2017 08:40:11 +0100 Subject: [PATCH 1/3] Move krakenbenchmark to main mozilla ruleset --- src/chrome/content/rules/Mozilla-self-signed.xml | 2 +- src/chrome/content/rules/Mozilla.xml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/rules/Mozilla-self-signed.xml b/src/chrome/content/rules/Mozilla-self-signed.xml index e2021400d222..bc5d482bb772 100644 --- a/src/chrome/content/rules/Mozilla-self-signed.xml +++ b/src/chrome/content/rules/Mozilla-self-signed.xml @@ -4,7 +4,7 @@ --> - + - + @@ -235,7 +236,6 @@ - @@ -260,6 +260,7 @@ + From 4903913ef74265f1007ae0daaa787cb9e94c2a65 Mon Sep 17 00:00:00 2001 From: Hugo Gruson Date: Sun, 29 Oct 2017 08:40:35 +0100 Subject: [PATCH 2/3] Delete Mozilla-self-signed.xml --- src/chrome/content/rules/Mozilla-self-signed.xml | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 src/chrome/content/rules/Mozilla-self-signed.xml diff --git a/src/chrome/content/rules/Mozilla-self-signed.xml b/src/chrome/content/rules/Mozilla-self-signed.xml deleted file mode 100644 index bc5d482bb772..000000000000 --- a/src/chrome/content/rules/Mozilla-self-signed.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - From b74707b2054db8fa5d28930a9c6e2cf7a657972c Mon Sep 17 00:00:00 2001 From: Hugo Gruson Date: Sun, 29 Oct 2017 08:54:34 +0100 Subject: [PATCH 3/3] Remove broken targets --- src/chrome/content/rules/Mozilla.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/chrome/content/rules/Mozilla.xml b/src/chrome/content/rules/Mozilla.xml index 445997e9573f..d2ed45a57ecc 100644 --- a/src/chrome/content/rules/Mozilla.xml +++ b/src/chrome/content/rules/Mozilla.xml @@ -99,8 +99,6 @@ - services - versioncheck - - affiliates - - affiliates-cdn (→ affiliates.mozilla.org) - archive - air - aus3 @@ -248,7 +246,6 @@ - @@ -286,11 +283,6 @@ - - - -