merge from default production-0.8 FIREFOX_26_0b3_BUILD1 FIREFOX_26_0b3_RELEASE
authorChris AtLee <catlee@mozilla.com>
Thu, 07 Nov 2013 13:05:29 -0500
branchproduction-0.8
changeset 902 75bfc678d50593d5fa7ffb6d2defa6c8021d7d11
parent 900 d1b15ab18f40eb6d6f16c40f2b012232db84478d (diff)
parent 901 7189e0a6bead73b39245b883264b29e369800efb (current diff)
child 903 439635fc714ea5cf71b9f00a3f3b1ca9e8243681
push id668
push usercatlee@mozilla.com
push dateThu, 07 Nov 2013 18:05:43 +0000
merge from default
master/buildbot/master.py
--- a/.hgtags
+++ b/.hgtags
@@ -1024,177 +1024,111 @@ bccbfc2a314f928cf80d86b0c1de2a58ffdc48bb
 bccbfc2a314f928cf80d86b0c1de2a58ffdc48bb FIREFOX_21_0b4_RELEASE
 bccbfc2a314f928cf80d86b0c1de2a58ffdc48bb FIREFOX_21_0b4_BUILD1
 bccbfc2a314f928cf80d86b0c1de2a58ffdc48bb FIREFOX_21_0b5_RELEASE
 bccbfc2a314f928cf80d86b0c1de2a58ffdc48bb FIREFOX_21_0b5_BUILD1
 bccbfc2a314f928cf80d86b0c1de2a58ffdc48bb FENNEC_21_0b6_RELEASE
 bccbfc2a314f928cf80d86b0c1de2a58ffdc48bb FENNEC_21_0b6_BUILD1
 bccbfc2a314f928cf80d86b0c1de2a58ffdc48bb FIREFOX_21_0b6_RELEASE
 bccbfc2a314f928cf80d86b0c1de2a58ffdc48bb FIREFOX_21_0b6_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_21_0b7_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_21_0b7_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_21_0b7_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_21_0b7_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_21_0_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_21_0_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_21_0_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_21_0_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_21_0_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_21_0_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_21_0_BUILD2
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_21_0b8_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_21_0b8_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_21_0_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_21_0_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_21_0_BUILD2
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_17_0_6esr_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_17_0_6esr_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 THUNDERBIRD_17_0_6esr_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 THUNDERBIRD_17_0_6esr_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 THUNDERBIRD_17_0_6_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 THUNDERBIRD_17_0_6_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_21_0_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_21_0_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_21_0_BUILD3
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_21_0_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_21_0_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_21_0_BUILD4
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_22_0b1_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_22_0b1_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_22_0b1_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_22_0b1_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 THUNDERBIRD_22_0b1_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 THUNDERBIRD_22_0b1_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_22_0b2_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_22_0b2_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_22_0b2_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_22_0b2_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 THUNDERBIRD_22_0b1_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 THUNDERBIRD_22_0b1_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 THUNDERBIRD_22_0b1_BUILD2
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_22_0b3_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_22_0b3_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_22_0b3_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_22_0b3_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_22_0b4_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_22_0b4_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_22_0b4_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_22_0b4_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_22_0b5_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_22_0b5_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_22_0b5_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_22_0b5_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_22_0b6_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_22_0b6_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_22_0b6_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_22_0b6_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_22_0_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_22_0_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_22_0_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_22_0_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_17_0_7esr_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_17_0_7esr_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_22_0_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_22_0_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_22_0_BUILD2
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 THUNDERBIRD_17_0_7_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 THUNDERBIRD_17_0_7_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 THUNDERBIRD_17_0_7esr_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 THUNDERBIRD_17_0_7esr_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_23_0b1_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_23_0b1_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_23_0b1_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_23_0b1_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_23_0b2_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_23_0b2_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_23_0b2_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_23_0b2_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 THUNDERBIRD_23_0b1_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 THUNDERBIRD_23_0b1_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_23_0b3_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_23_0b3_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_23_0b4_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_23_0b4_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_23_0b4_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_23_0b4_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_23_0b5_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_23_0b5_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_23_0b6_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_23_0b6_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_23_0b6_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_23_0b6_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_23_0b7_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_23_0b7_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_23_0b8_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_23_0b8_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_23_0b8_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_23_0b8_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_23_0b8_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_23_0b8_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_23_0b8_BUILD2
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_23_0b9_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_23_0b9_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_23_0b10_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_23_0b10_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_23_0b10_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_23_0b10_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_17_0_8esr_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_17_0_8esr_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_23_0_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_23_0_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_23_0_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_23_0_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 THUNDERBIRD_17_0_8esr_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 THUNDERBIRD_17_0_8esr_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 THUNDERBIRD_17_0_8_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 THUNDERBIRD_17_0_8_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_23_0_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_23_0_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_23_0_BUILD2
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_17_0_8esr_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_17_0_8esr_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_17_0_8esr_BUILD2
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_24_0b1_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_24_0b1_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_24_0b1_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_24_0b1_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_24_0b1_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_24_0b1_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_24_0b1_BUILD2
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_24_0b1_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_24_0b1_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_24_0b1_BUILD2
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_24_0b1_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_24_0b1_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_24_0b1_BUILD3
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_24_0b2_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FENNEC_24_0b2_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_24_0b2_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_24_0b2_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 THUNDERBIRD_24_0b1_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 THUNDERBIRD_24_0b1_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 THUNDERBIRD_24_0b1_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 THUNDERBIRD_24_0b1_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 THUNDERBIRD_24_0b1_BUILD2
+0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_24_0b3_RELEASE
+0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_24_0b3_BUILD1
 0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_23_0_1_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 FIREFOX_23_0_1_BUILD1
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 THUNDERBIRD_24_0b1_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 THUNDERBIRD_24_0b1_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 THUNDERBIRD_24_0b1_BUILD3
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 THUNDERBIRD_24_0b1_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 THUNDERBIRD_24_0b1_RELEASE
-0ba2f2a46a9326dc2821d619ed61da44ac2df228 THUNDERBIRD_24_0b1_BUILD4
-ae85aeccb11efce5b9bd2dcb9951b309da195553 FENNEC_24_0b4_RELEASE
-ae85aeccb11efce5b9bd2dcb9951b309da195553 FENNEC_24_0b4_BUILD1
-ae85aeccb11efce5b9bd2dcb9951b309da195553 FIREFOX_24_0b4_RELEASE
-ae85aeccb11efce5b9bd2dcb9951b309da195553 FIREFOX_24_0b4_BUILD1
-ae85aeccb11efce5b9bd2dcb9951b309da195553 FIREFOX_24_0b5_RELEASE
-ae85aeccb11efce5b9bd2dcb9951b309da195553 FIREFOX_24_0b5_BUILD1
-ae85aeccb11efce5b9bd2dcb9951b309da195553 FENNEC_24_0b6_RELEASE
-ae85aeccb11efce5b9bd2dcb9951b309da195553 FENNEC_24_0b6_BUILD1
-ae85aeccb11efce5b9bd2dcb9951b309da195553 FIREFOX_24_0b6_RELEASE
-ae85aeccb11efce5b9bd2dcb9951b309da195553 FIREFOX_24_0b6_BUILD1
-ae85aeccb11efce5b9bd2dcb9951b309da195553 THUNDERBIRD_24_0b2_RELEASE
-ae85aeccb11efce5b9bd2dcb9951b309da195553 THUNDERBIRD_24_0b2_BUILD1
-ae85aeccb11efce5b9bd2dcb9951b309da195553 FIREFOX_24_0b7_RELEASE
-ae85aeccb11efce5b9bd2dcb9951b309da195553 FIREFOX_24_0b7_BUILD1
-ae85aeccb11efce5b9bd2dcb9951b309da195553 FIREFOX_24_0b8_RELEASE
-ae85aeccb11efce5b9bd2dcb9951b309da195553 FIREFOX_24_0b8_BUILD1
+801d11f42e07836088ada75cef023788a866e983 FIREFOX_23_0_1_RELEASE
+801d11f42e07836088ada75cef023788a866e983 FIREFOX_23_0_1_BUILD2
+ae85aeccb11efce5b9bd2dcb9951b309da195553 FENNEC_24_0b8_RELEASE
+ae85aeccb11efce5b9bd2dcb9951b309da195553 FENNEC_24_0b8_BUILD1
+0221ee9e981222a06630eace26a173f867e2b4be FIREFOX_24_0b9_RELEASE
+0221ee9e981222a06630eace26a173f867e2b4be FIREFOX_24_0b9_BUILD1
+2c53db53c3fb46c19cfbe7e932d841a7b7d4e93b FENNEC_24_0b10_RELEASE
+2c53db53c3fb46c19cfbe7e932d841a7b7d4e93b FENNEC_24_0b10_BUILD1
+99083a263e31561075d43118bdf5075a6597a5a3 FIREFOX_24_0b10_RELEASE
+99083a263e31561075d43118bdf5075a6597a5a3 FIREFOX_24_0b10_BUILD1
+c595d94d312702cbacce68ebce74bc27b75dd301 THUNDERBIRD_24_0b3_RELEASE
+c595d94d312702cbacce68ebce74bc27b75dd301 THUNDERBIRD_24_0b3_BUILD1
+528714694a3171764830a6ae7c61b26e762fecba FIREFOX_24_0_RELEASE
+528714694a3171764830a6ae7c61b26e762fecba FIREFOX_24_0_BUILD1
+275c023c935ea4d9028a0ba342e184534220800f FIREFOX_24_0esr_RELEASE
+275c023c935ea4d9028a0ba342e184534220800f FIREFOX_24_0esr_BUILD1
+2c53db53c3fb46c19cfbe7e932d841a7b7d4e93b FENNEC_24_0b10_RELEASE
+567f865e277d3d8e280fb06504618d985032ab2e FENNEC_24_0b10_RELEASE
+567f865e277d3d8e280fb06504618d985032ab2e FENNEC_24_0b10_BUILD2
+5a367b054d0ad5d60ba19e844f803e3ce56df72e FIREFOX_17_0_9esr_RELEASE
+5a367b054d0ad5d60ba19e844f803e3ce56df72e FIREFOX_17_0_9esr_BUILD1
+7ef1f3df649e45ef27e8cd9e83e48d8960ff349f FENNEC_24_0_RELEASE
+7ef1f3df649e45ef27e8cd9e83e48d8960ff349f FENNEC_24_0_BUILD1
+03a2f7444c7a6960cfd0eefe0e6275d6ff227b5c THUNDERBIRD_17_0_9esr_RELEASE
+03a2f7444c7a6960cfd0eefe0e6275d6ff227b5c THUNDERBIRD_17_0_9esr_BUILD1
+42d5658ba4b7f12d3a86957bbdb79125ce0d679f THUNDERBIRD_24_0_RELEASE
+42d5658ba4b7f12d3a86957bbdb79125ce0d679f THUNDERBIRD_24_0_BUILD1
+6a68b0119727b0bf299c02a60ab024aea81c5d7d FENNEC_25_0b1_RELEASE
+6a68b0119727b0bf299c02a60ab024aea81c5d7d FENNEC_25_0b1_BUILD1
+41c269e2dcdf0427296ed6b0005c5493d2f9cbac FIREFOX_25_0b1_RELEASE
+41c269e2dcdf0427296ed6b0005c5493d2f9cbac FIREFOX_25_0b1_BUILD1
+6a68b0119727b0bf299c02a60ab024aea81c5d7d FENNEC_25_0b1_RELEASE
+71581aadc91fd98ce5889bbea9ccff942ca6edc2 FENNEC_25_0b1_RELEASE
+71581aadc91fd98ce5889bbea9ccff942ca6edc2 FENNEC_25_0b1_BUILD2
+183267405d17cfcdb0934096a72e9cd76a2ab993 FENNEC_25_0b2_RELEASE
+183267405d17cfcdb0934096a72e9cd76a2ab993 FENNEC_25_0b2_BUILD1
+d35262203bbe4da64a367963409c6e390e6484dc FIREFOX_25_0b2_RELEASE
+d35262203bbe4da64a367963409c6e390e6484dc FIREFOX_25_0b2_BUILD1
+aad01079fc6394d1a7c80dd946610d1155179eb5 FIREFOX_25_0b3_RELEASE
+aad01079fc6394d1a7c80dd946610d1155179eb5 FIREFOX_25_0b3_BUILD1
+bd16c54bd095349e820193f676c50ff17e8c8b51 FENNEC_25_0b4_RELEASE
+bd16c54bd095349e820193f676c50ff17e8c8b51 FENNEC_25_0b4_BUILD1
+bdc4254f3e20038be5ec53e75214397b5d67b884 FIREFOX_25_0b4_RELEASE
+bdc4254f3e20038be5ec53e75214397b5d67b884 FIREFOX_25_0b4_BUILD1
+184d13ad45eddb890e97f6abeaaa21ad9204572d FENNEC_25_0b6_RELEASE
+184d13ad45eddb890e97f6abeaaa21ad9204572d FENNEC_25_0b6_BUILD1
+fa48442ceeb40b5c163bbd56246c04b7b1c5a7f2 FIREFOX_25_0b6_RELEASE
+fa48442ceeb40b5c163bbd56246c04b7b1c5a7f2 FIREFOX_25_0b6_BUILD1
+0a03a73d73cea744ca1d58ebdfb9dedb7de6ae52 THUNDERBIRD_24_0_1_RELEASE
+0a03a73d73cea744ca1d58ebdfb9dedb7de6ae52 THUNDERBIRD_24_0_1_BUILD1
+2527fdf45b5fb464bac35fb2ad38cc0df4f7aa29 FIREFOX_25_0b7_RELEASE
+2527fdf45b5fb464bac35fb2ad38cc0df4f7aa29 FIREFOX_25_0b7_BUILD1
+5f2ca10de0d54ca638f553d0d7d52d99a1b76b47 FENNEC_25_0b8_RELEASE
+5f2ca10de0d54ca638f553d0d7d52d99a1b76b47 FENNEC_25_0b8_BUILD1
+9169852058dc7d2d3c015c267aee4dbfb242619a FIREFOX_25_0b8_RELEASE
+9169852058dc7d2d3c015c267aee4dbfb242619a FIREFOX_25_0b8_BUILD1
+feb8f416e473f590c42b6ca13aedf043691855f2 THUNDERBIRD_25_0b1_RELEASE
+feb8f416e473f590c42b6ca13aedf043691855f2 THUNDERBIRD_25_0b1_BUILD1
+d47b00ad80e1b1ef13d217c08ab0a25cff8421be FIREFOX_25_0b9_RELEASE
+d47b00ad80e1b1ef13d217c08ab0a25cff8421be FIREFOX_25_0b9_BUILD1
+2446cca0d4236d3b788df068813f6a855ab44019 FENNEC_25_0b10_RELEASE
+2446cca0d4236d3b788df068813f6a855ab44019 FENNEC_25_0b10_BUILD1
+88efb9916017fdc12896104e4e06557995755496 FENNEC_25_0_RELEASE
+88efb9916017fdc12896104e4e06557995755496 FENNEC_25_0_BUILD1
+17944172479de5f4fffaaa1a65ba4b48fef06131 FIREFOX_25_0b10_RELEASE
+17944172479de5f4fffaaa1a65ba4b48fef06131 FIREFOX_25_0b10_BUILD1
+2a7587559dee9064e2603b959fff67075b5cbc99 FIREFOX_25_0_RELEASE
+2a7587559dee9064e2603b959fff67075b5cbc99 FIREFOX_25_0_BUILD1
+66d7c5b1f6a7ac468c29bffed4dd6adfabd2faa9 FIREFOX_24_1_0esr_RELEASE
+66d7c5b1f6a7ac468c29bffed4dd6adfabd2faa9 FIREFOX_24_1_0esr_BUILD1
+cc10c6a41778bfb747cd70d2e3bee1ce4beb5616 FIREFOX_17_0_10esr_RELEASE
+cc10c6a41778bfb747cd70d2e3bee1ce4beb5616 FIREFOX_17_0_10esr_BUILD1
+fd832cc74e143f09a25ccd78f2f3fc9bbbf9e45a FIREFOX_25_0b11_RELEASE
+fd832cc74e143f09a25ccd78f2f3fc9bbbf9e45a FIREFOX_25_0b11_BUILD1
+88efb9916017fdc12896104e4e06557995755496 FENNEC_25_0_RELEASE
+7f13877d5c067ff5a22d585335bfc413181ef128 FENNEC_25_0_RELEASE
+7f13877d5c067ff5a22d585335bfc413181ef128 FENNEC_25_0_BUILD2
+2a7587559dee9064e2603b959fff67075b5cbc99 FIREFOX_25_0_RELEASE
+748a4b393ea83efef171479de9389f9bfe74104d FIREFOX_25_0_RELEASE
+748a4b393ea83efef171479de9389f9bfe74104d FIREFOX_25_0_BUILD2
+eac331bac156c4d27a6eabae306eaffb8c241501 THUNDERBIRD_24_1_0_RELEASE
+eac331bac156c4d27a6eabae306eaffb8c241501 THUNDERBIRD_24_1_0_BUILD1
+7f13877d5c067ff5a22d585335bfc413181ef128 FENNEC_25_0_RELEASE
+8d71709f1181f9081b672cfeb314a55744e402b9 FENNEC_25_0_RELEASE
+8d71709f1181f9081b672cfeb314a55744e402b9 FENNEC_25_0_BUILD3
+134500339b14d574ff91942c766dd38d8778257f FIREFOX_25_0b12_RELEASE
+134500339b14d574ff91942c766dd38d8778257f FIREFOX_25_0b12_BUILD1
+748a4b393ea83efef171479de9389f9bfe74104d FIREFOX_25_0_RELEASE
+ac038135bba3288b4d6574194b25dc166b53fe84 FIREFOX_25_0_RELEASE
+ac038135bba3288b4d6574194b25dc166b53fe84 FIREFOX_25_0_BUILD3
+81c6f15b38cd2ed77d260bf9b9d18b8560e5a610 THUNDERBIRD_17_0_10esr_RELEASE
+81c6f15b38cd2ed77d260bf9b9d18b8560e5a610 THUNDERBIRD_17_0_10esr_BUILD1
+12d5a63423f92aee33f03b50a2e1c9296ee78afc FENNEC_26_0b1_RELEASE
+12d5a63423f92aee33f03b50a2e1c9296ee78afc FENNEC_26_0b1_BUILD1
+6425f8b7186b186a75e757a1db712b500f98aed7 FIREFOX_26_0b1_RELEASE
+6425f8b7186b186a75e757a1db712b500f98aed7 FIREFOX_26_0b1_BUILD1
+34eec6cdea492df6009449ee695140cba84fe5be FENNEC_26_0b2_RELEASE
+34eec6cdea492df6009449ee695140cba84fe5be FENNEC_26_0b2_BUILD1
+ba89cbb0c1745d1c778fd76a7240e7af10233785 FIREFOX_26_0b2_RELEASE
+ba89cbb0c1745d1c778fd76a7240e7af10233785 FIREFOX_26_0b2_BUILD1
new file mode 100644
--- /dev/null
+++ b/README.mozilla
@@ -0,0 +1,1 @@
+This is the production branch for Mozilla's Buildbot 0.8.x masters.
--- a/master/buildbot/buildslave.py
+++ b/master/buildbot/buildslave.py
@@ -89,24 +89,18 @@ class AbstractBuildSlave(pb.Avatar, serv
         self.missing_timeout = new.missing_timeout
 
         self.properties.updateFromProperties(new.properties)
 
         if self.botmaster:
             self.updateLocks()
 
     def __repr__(self):
-        if self.botmaster:
-            builders = self.botmaster.getBuildersForSlave(self.slavename)
-            return "<%s '%s', current builders: %s>" % \
-               (self.__class__.__name__, self.slavename,
-                ','.join(map(lambda b: b.name, builders)))
-        else:
-            return "<%s '%s', (no builders yet)>" % \
-                (self.__class__.__name__, self.slavename)
+        return "<%s '%s'>" % \
+            (self.__class__.__name__, self.slavename)
 
     def updateLocks(self):
         # convert locks into their real form
         locks = []
         for access in self.access:
             if not isinstance(access, LockAccess):
                 access = access.defaultAccess()
             lock = self.botmaster.getLockByID(access.lockid)
--- a/master/buildbot/master.py
+++ b/master/buildbot/master.py
@@ -342,18 +342,35 @@ class BotMaster(service.MultiService):
             # report the IP addresses of both so someone can resolve the
             # squabble
             old_tport = sl.slave.broker.transport
             new_tport = mind.broker.transport
             log.msg("old slave was connected from", old_tport.getPeer())
             log.msg("new slave is from", new_tport.getPeer())
 
             # ping the old slave.  If this kills it, then the new slave will connect
-            # again and everyone will be happy.
+            # again and everyone will be happy.  If we don't hear back from the
+            # slave in a reasonable amount of time, then kill the old slave too
+            timeout_delay = 30
+            def timeout():
+                # If our transport hasn't changed, then we can disconnect
+                # If the transport _has_ changed, then we were probably able to
+                # reconnect, perhaps from a previously queued-up delayedCall.
+                # In anycase, don't disconnect the new transport if it's
+                # different from what was here before.
+                if sl.slave and old_tport.getPeer() == sl.slave.broker.transport.getPeer():
+                    log.msg("didn't hear back from slave in %i seconds; killing existing connection" % timeout_delay)
+                    sl.disconnect()
+
+            killswitch = reactor.callLater(timeout_delay, timeout)
             d = sl.slave.callRemote("print", "master got a duplicate connection; keeping this one")
+            def cb(_):
+                if killswitch.active():
+                    killswitch.cancel()
+            d.addCallback(cb)
 
             # now return a dummy avatar and kill the new connection in 5
             # seconds, thereby giving the ping a bit of time to kill the old
             # connection, if necessary
             def kill():
                 log.msg("killing new slave on", new_tport.getPeer())
                 new_tport.loseConnection()
             reactor.callLater(5, kill)
--- a/master/buildbot/monkey.py
+++ b/master/buildbot/monkey.py
@@ -8,17 +8,17 @@ def monkeypatch_twisted_cbLogin():
     from twisted.python.versions import Version
 
     # This patch is known to work in versions 8.2.0 -> 11.0.0
     # If your version is outside this range, but this monkey patch still
     # applies, please update this version check!
     # If your version of twisted doesn't need this, returning early is the
     # right thing to do.
     assert Version('twisted', 8, 2, 0) <= twisted.version <= \
-            Version('twisted', 11, 0, 0), \
+            Version('twisted', 12, 0, 0), \
             "monkeypatch failed version check; see note in monkey.py"
 
     import twisted.spread.pb
     from twisted.spread.interfaces import IJellyable
     from twisted.spread.pb import AsReferenceable
 
     def monkeyed_cbLogin(self, (interface, avatar, logout)):
         """
--- a/master/buildbot/scripts/runner.py
+++ b/master/buildbot/scripts/runner.py
@@ -526,16 +526,19 @@ class MasterOptions(MakerBase):
 
 
 masterTACTemplate = ["""
 import os
 
 from twisted.application import service
 from buildbot.master import BuildMaster
 
+import twisted.spread.pb
+twisted.spread.pb.MAX_BROKER_REFS = 2048
+
 basedir = r'%(basedir)s'
 rotateLength = %(log-size)s
 maxRotatedFiles = %(log-count)s
 
 # if this is a relocatable tac file, get the directory containing the TAC
 if basedir == '.':
     import os.path
     basedir = os.path.abspath(os.path.dirname(__file__))