Bug 1211770 - Disable HSTS/HPKP updates on b2g 2.2 branches - r=kmoir
authorChris Cooper <ccooper@deadsquid.com>
Wed, 06 Jan 2016 10:54:29 -0500 (2016-01-06)
changeset 13540 65d3648d9b2791177fd80167990a8672d40c5f0e
parent 13539 4b67594abc24ae2962a0689f9eb394036c45828d
child 13541 f7d9ee4eab35ba76653c15982617d9c745f71e15
push id9558
push usercoop@mozilla.com
push dateWed, 06 Jan 2016 15:54:33 +0000 (2016-01-06)
reviewerskmoir
bugs1211770
Bug 1211770 - Disable HSTS/HPKP updates on b2g 2.2 branches - r=kmoir
mozilla/config.py
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -2533,18 +2533,18 @@ BRANCHES['mozilla-b2g37_v2_2']['l10nNigh
 BRANCHES['mozilla-b2g37_v2_2']['l10n_platforms'] = ['linux', 'linux64',
                                                     'win32', 'macosx64']
 BRANCHES['mozilla-b2g37_v2_2']['l10nDatedDirs'] = True
 BRANCHES['mozilla-b2g37_v2_2']['enUS_binaryURL'] = \
     GLOBAL_VARS['download_base_url'] + '/nightly/latest-mozilla-b2g37_v2_2'
 BRANCHES['mozilla-b2g37_v2_2']['enable_nightly'] = False
 BRANCHES['mozilla-b2g37_v2_2']['create_partial'] = False
 BRANCHES['mozilla-b2g37_v2_2']['enable_blocklist_update'] = False
-BRANCHES['mozilla-b2g37_v2_2']['enable_hsts_update'] = True
-BRANCHES['mozilla-b2g37_v2_2']['enable_hpkp_update'] = True
+BRANCHES['mozilla-b2g37_v2_2']['enable_hsts_update'] = False
+BRANCHES['mozilla-b2g37_v2_2']['enable_hpkp_update'] = False
 BRANCHES['mozilla-b2g37_v2_2']['enable_valgrind'] = False
 BRANCHES['mozilla-b2g37_v2_2']['enabled_products'] = ['firefox']
 
 ######## mozilla-b2g37_v2_2r
 BRANCHES['mozilla-b2g37_v2_2r']['repo_path'] = 'releases/mozilla-b2g37_v2_2r'
 BRANCHES['mozilla-b2g37_v2_2r']['update_channel'] = 'nightly-b2g37-2.2r'
 BRANCHES['mozilla-b2g37_v2_2r']['l10n_repo_path'] = 'releases/l10n/mozilla-aurora'
 BRANCHES['mozilla-b2g37_v2_2r']['enable_weekly_bundle'] = False
@@ -2561,18 +2561,18 @@ BRANCHES['mozilla-b2g37_v2_2r']['l10nNig
 BRANCHES['mozilla-b2g37_v2_2r']['l10n_platforms'] = ['linux', 'linux64',
                                                     'win32', 'macosx64']
 BRANCHES['mozilla-b2g37_v2_2r']['l10nDatedDirs'] = True
 BRANCHES['mozilla-b2g37_v2_2r']['enUS_binaryURL'] = \
     GLOBAL_VARS['download_base_url'] + '/nightly/latest-mozilla-b2g37_v2_2r'
 BRANCHES['mozilla-b2g37_v2_2r']['enable_nightly'] = False
 BRANCHES['mozilla-b2g37_v2_2r']['create_partial'] = False
 BRANCHES['mozilla-b2g37_v2_2r']['enable_blocklist_update'] = False
-BRANCHES['mozilla-b2g37_v2_2r']['enable_hsts_update'] = True
-BRANCHES['mozilla-b2g37_v2_2r']['enable_hpkp_update'] = True
+BRANCHES['mozilla-b2g37_v2_2r']['enable_hsts_update'] = False
+BRANCHES['mozilla-b2g37_v2_2r']['enable_hpkp_update'] = False
 BRANCHES['mozilla-b2g37_v2_2r']['enable_valgrind'] = False
 BRANCHES['mozilla-b2g37_v2_2r']['enabled_products'] = ['firefox']
 
 ######## mozilla-b2g44_v2_5
 BRANCHES['mozilla-b2g44_v2_5']['repo_path'] = 'releases/mozilla-b2g44_v2_5'
 BRANCHES['mozilla-b2g44_v2_5']['update_channel'] = 'nightly-b2g44-2.5'
 BRANCHES['mozilla-b2g44_v2_5']['l10n_repo_path'] = 'releases/l10n/mozilla-aurora'
 BRANCHES['mozilla-b2g44_v2_5']['enable_weekly_bundle'] = False