Merging from default

changeset:   2865:7e8ef8b5dd31
parent:      2859:74f415324874
parent:      2864:757e2706bbc6
user:        Aki Sasaki <asasaki@mozilla.com>
date:        Mon Jun 16 15:54:30 2014 -0700
summary:     merge prod-> default

changeset:   2866:19ab422fd4c1
tag:         tip
user:        Peter Moore <pmoore@mozilla.com>
date:        Tue Jun 17 15:05:40 2014 +0200
summary:     Bug 962853 - vcs-sync needs to populate mapper db once it's live,r=aki

--HG--
branch : production
Merging default -> production
changeset:   2868:3230c9fbf560
parent:      2866:19ab422fd4c1
user:        Aki Sasaki <asasaki@mozilla.com>
date:        Tue Jun 17 17:25:38 2014 -0700
summary:     bug 918055 - b2g branching script with revision locking. r=rail

changeset:   2869:90e793f7c2aa
user:        Aki Sasaki <asasaki@mozilla.com>
date:        Tue Jun 17 17:35:57 2014 -0700
summary:     bug 918055 - address review comments for 3230c9fbf560. r=rail

changeset:   2870:0183ef99b9ea
user:        Aki Sasaki <asasaki@mozilla.com>
date:        Tue Jun 17 18:33:43 2014 -0700
summary:     bug 918055 - readd the git reset --hard. r=rail

changeset:   2871:4ef9ebab4dc2
tag:         tip
user:        Steve Fink <sfink@mozilla.com>
date:        Wed Jun 18 13:34:37 2014 -0700
summary:     Backed out changeset b2069bb5736e (bug 898554), the self.enable_mock() stuff, because multiple other builds expect self.run_command_m to do self.setup_mock() based purely on self.config['mock_target'].

--HG--
branch : production
Merging from default

changeset:   2873:03e447b25006
tag:         tip
parent:      2871:4ef9ebab4dc2
user:        Hal Wine <hwine@mozilla.com>
date:        Thu Jun 19 10:27:11 2014 -0700
summary:     bug 1024403 - new upstream source of mirrors; r=catlee

--HG--
branch : production
Added FIREFOX_31_0b3_RELEASE FIREFOX_31_0b3_BUILD1 tag(s) for changeset production. DONTBUILD CLOSED TREE a=release

--HG--
branch : production
Merging from default

changeset:   2876:8cec6396354b
tag:         tip
parent:      2873:03e447b25006
user:        Jonathan Griffin <jgriffin@mozilla.com>
date:        Thu Jun 19 15:24:35 2014 -0700
summary:     Bug 1013201 - Use in-tree config to override gaia build opts, if it exists, r=zac

--HG--
branch : production
Bug 874510 - Add make_node_modules to gaia_unit script

--HG--
branch : production
Added FENNEC_31_0b4_RELEASE FENNEC_31_0b4_BUILD1 tag(s) for changeset production. DONTBUILD CLOSED TREE a=release

--HG--
branch : production
Added FIREFOX_31_0b4_RELEASE FIREFOX_31_0b4_BUILD1 tag(s) for changeset production. DONTBUILD CLOSED TREE a=release

--HG--
branch : production
Merging from default

changeset:   2878:244e1b4da23e
parent:      2876:8cec6396354b
user:        Steve Fink <sfink@mozilla.com>
date:        Wed May 28 11:05:58 2014 -0700
summary:     Bug 898554 - Find hgtool, gittool at an absolute path, r=catlee

changeset:   2879:1527d06e46bd
user:        Steve Fink <sfink@mozilla.com>
date:        Wed May 28 11:05:58 2014 -0700
summary:     Bug 898554 - Extract out common portions of b2g build and b2g hazard analysis into a base class, r=catlee

changeset:   2880:b80a78e3e53a
user:        Steve Fink <sfink@mozilla.com>
date:        Sat Jun 21 16:59:39 2014 -0700
summary:     Bug 898554 - Ensure setup_mock is called early with the correct config, r=aki

changeset:   2881:b189cc9b9161
user:        Kim Moir <kmoir@mozilla.com>
date:        Mon Jun 23 10:23:41 2014 -0400
summary:     Bug 1028293 - Increase Android 2.3 mochitest chunks, for aws r=kmoir

changeset:   2882:88dadf43baa5
user:        Jonathan Griffin <jgriffin@mozilla.com>
date:        Mon Jun 23 13:10:15 2014 -0700
summary:     Bug 874510 - Add make_node_modules to gaia_unit script

--HG--
branch : production
Merge from default

--HG--
branch : production
Added FIREFOX_31_0b5_RELEASE FIREFOX_31_0b5_BUILD1 tag(s) for changeset production. DONTBUILD CLOSED TREE a=release

--HG--
branch : production
Added FIREFOX_31_0b6_RELEASE FIREFOX_31_0b6_BUILD1 tag(s) for changeset production. DONTBUILD CLOSED TREE a=release

--HG--
branch : production
Added FENNEC_31_0b6_RELEASE FENNEC_31_0b6_BUILD2 tag(s) for changeset production. DONTBUILD CLOSED TREE a=release

--HG--
branch : production
Added FIREFOX_31_0b6_RELEASE FIREFOX_31_0b6_BUILD2 tag(s) for changeset production. DONTBUILD CLOSED TREE a=release

--HG--
branch : production
Merging from default

changeset:   2889:e095aa215e3c
parent:      2887:dd042bcf9f47
user:        Armen Zambrano Gasparnian <armenzg@mozilla.com>
date:        Tue Jun 24 17:27:02 2014 -0400
summary:     Bug 986112 - Make blobber uploads discoverable. r=aki

changeset:   2890:c49fa160c924
user:        Armen Zambrano Gasparnian <armenzg@mozilla.com>
date:        Tue Jun 24 17:37:07 2014 -0400
summary:     Backout e095aa215e3c. r=backout

changeset:   2891:c4e0534d7b2e
user:        Jonathan Griffin <jgriffin@mozilla.com>
date:        Wed Jun 25 16:36:49 2014 -0700
summary:     Bug 1028816 - Pass env variables on the command-line, r=jhford

changeset:   2892:126900c316ea
user:        Armen Zambrano Gasparnian <armenzg@mozilla.com>
date:        Thu Jun 26 09:13:41 2014 -0400
summary:     Bug 986112 - Request blobuploader to upload a summary of all uploaded files. r=aki

changeset:   2893:e8c037e4feca
user:        Jonathan Griffin <jgriffin@mozilla.com>
date:        Thu Jun 26 10:50:12 2014 -0700
summary:     Bug 1028816 - Remove quotes

changeset:   2895:90e3a18d9ac7
parent:      2893:e8c037e4feca
user:        Jonathan Griffin <jgriffin@mozilla.com>
date:        Mon Jun 30 12:12:45 2014 -0700
summary:     Bug 874510 - Use make update-common instead of make node_modules, r=julienw

changeset:   2896:b2576e91fd9e
user:        Jonathan Griffin <jgriffin@mozilla.com>
date:        Mon Jun 30 12:48:50 2014 -0700
summary:     Backed out changeset 90e3a18d9ac7

changeset:   2897:8135cd2fdad9
user:        Jonathan Griffin <jgriffin@mozilla.com>
date:        Mon Jun 30 13:31:46 2014 -0700
summary:     Bug 1025731 - Use new xre.zip on linux64_gecko Gi

changeset:   2898:383ef298caf0
user:        Steve Fink <sfink@mozilla.com>
date:        Wed May 28 11:05:58 2014 -0700
summary:     Bug 898554 - Add a new b2g hazard build script, r=catlee

changeset:   2900:35d2981a6365
parent:      2898:383ef298caf0
user:        Jonathan Griffin <jgriffin@mozilla.com>
date:        Mon Jun 30 15:41:26 2014 -0700
summary:     Bug 874510 - Run 'make node_modules' then 'make update-common', r=julienw

changeset:   2901:930858624d92
user:        Steve Fink <sfink@mozilla.com>
date:        Mon Jun 30 16:46:02 2014 -0700
summary:     Bug 898554 - Spot fix some path breakage due to part of a later patch (fallback manifests) sneaking in

changeset:   2902:404dfba5c39d
user:        Jonathan Griffin <jgriffin@mozilla.com>
date:        Mon Jun 30 16:48:49 2014 -0700
summary:     Bug 1025731 - Use new osx xre.zip for OSX tests

changeset:   2905:e89b33af0900
tag:         tip
parent:      2902:404dfba5c39d
user:        John Ford <jhford@mozilla.com>
date:        Tue Jul 01 11:16:20 2014 -0700
summary:     Bug 1025322 - gaia-try: do a merge locally instead of using the pull request reference r=aki

--HG--
branch : production
Merging from default

--HG--
branch : production
Merging from default

changeset:   2910:bb560b1b2105
parent:      2908:49614d76da28
user:        Armen Zambrano Gasparnian <armenzg@mozilla.com>
date:        Wed Jul 02 09:45:40 2014 -0400
summary:     Bug 986112 - Use newer version of blobuploader. r=bump

changeset:   2911:c47cc63deeb8
user:        Geoff Brown <gbrown@mozilla.com>
date:        Wed Jul 02 08:30:13 2014 -0600
summary:     Bug 1030342 - Create /data/anr directory on Android 2.3 and Android x86; r=kmoir

changeset:   2912:0040022e55be
user:        Chris Manchester <cmanchester@mozilla.com>
date:        Wed Jul 02 14:06:30 2014 -0400
summary:     Bug 1024055 - Alter marionette's mozharness script to use structured log data to determine job status.; r=aki,ahal

changeset:   2913:141595cb922b
user:        Jordan Lund <jlund@mozilla.com>
date:        Wed Jul 02 15:20:13 2014 -0700
summary:     Bug 1033074 - Fix error parsing for webapprt tests, r=jgriffin

changeset:   2914:760bdc8e04b6
user:        Steve Fink <sfink@mozilla.com>
date:        Thu Jul 03 10:43:43 2014 -0700
summary:     Bug 898554 - Run hazard commands under mock when needed, r=jlund

changeset:   2915:7e109100febe
tag:         tip
user:        Steve Fink <sfink@mozilla.com>
date:        Thu Jul 03 10:43:45 2014 -0700
summary:     Bug 898554 - Remove verbose sixgill warning message that makes the log file overflow the size cap

--HG--
branch : production
Added FIREFOX_31_0b7_RELEASE FIREFOX_31_0b7_BUILD1 tag(s) for changeset production. DONTBUILD CLOSED TREE a=release

--HG--
branch : production
Added THUNDERBIRD_31_0b2_RELEASE THUNDERBIRD_31_0b2_BUILD1 tag(s) for changeset production. DONTBUILD CLOSED TREE a=release

--HG--
branch : production
Merging from default

changeset:   2919:081bbea1a00b
parent:      2915:7e109100febe
user:        Steve Fink <sfink@mozilla.com>
date:        Sun Jul 06 23:23:27 2014 -0700
summary:     Bug 981225 - Use short revisions to fix try upload dir path, r=jlund

changeset:   2920:c6dd0055188d
tag:         tip
user:        Steve Fink <sfink@mozilla.com>
date:        Sun Jul 06 23:23:32 2014 -0700
summary:     Bug 981225 - Switch from using buildtime to buildid, r=jlund

--HG--
branch : production