Skip to content
This repository has been archived by the owner on Jul 3, 2018. It is now read-only.

merge from upstream #78

Merged
merged 2,653 commits into from
Jun 7, 2016
Merged

merge from upstream #78

merged 2,653 commits into from
Jun 7, 2016

Conversation

mykmelez
Copy link
Contributor

@mykmelez mykmelez commented Jun 7, 2016

No description provided.

jhector and others added 30 commits May 26, 2016 16:20
…vent-regions items to end up below items they are supposed to cover. r=mattwoodrow

MozReview-Commit-ID: BxnshG9TgRb

--HG--
extra : rebase_source : 5817e50d64a1211e224c9b6dbd3e3efdcd5e48f0
extra : intermediate-source : 6f03149a7565e317156cc7218120f39c9fb41915
extra : source : 4c1ca58448e3513691f92c1f9f0a92329ccc17c5
extra : histedit_source : d3ddaa7425ac1e2a1b019c957525653aeee8a4da
MozReview-Commit-ID: H9KCM2zZulA

--HG--
extra : rebase_source : 51387a1bd37f1b22bdb5100abe83af17c0caa481
…ITIALIZED. r=kinetik.

MozReview-Commit-ID: DeGSEpSWYSM

--HG--
extra : rebase_source : d2ab8b8abb7e9893934783b99939bbfe359e93d0
… is not as expected. r=me

MozReview-Commit-ID: 4GtQMLOLZNP
This lets us put the two paths of upload code all in the same place.

MozReview-Commit-ID: BUsdyEAcdDO

--HG--
extra : rebase_source : a854facb606afd95764feac19fb5ef64f216addf
…ebastian

MozReview-Commit-ID: EPLUd5Uq0Pc

--HG--
extra : rebase_source : ad7f650414c15ac44b64acb371a04f3cfea3d0e2
MozReview-Commit-ID: DIxkY3F3Z6S

--HG--
extra : rebase_source : 0e13c316b6fc4a5522a52f75c5f00ffd54a7baab
The same preferences will be used by the new code & the old code.

MozReview-Commit-ID: BXuSQjhhXQq

--HG--
extra : rebase_source : 8824624c524392c0178535c47bf9657ba9cf9168
MozReview-Commit-ID: 4UReiDeNCg4

--HG--
extra : rebase_source : f8b71109e5673c083b1f7d9d184f901998a40174
…s on Windows. r=mhowell

MozReview-Commit-ID: IFi2Z7sqaxW

--HG--
extra : rebase_source : fc8c270847e29a88c6b27c3b18bf39f8eb1f03fd
We are doing more than just uploading in the delegate now.

I didn't fix this in the previous commits because version control makes this
non-trivial.

MozReview-Commit-ID: IjXsQC19k2S

--HG--
extra : rebase_source : 710fd827dd1468ca22c6372d101d3541040005ce
MozReview-Commit-ID: CIkvOZrqHwT

--HG--
extra : rebase_source : 9ed4662dd6b766536ecaef2e6e7b199d1d444cd3
MozReview-Commit-ID: 7ojczu4rOnD

--HG--
extra : rebase_source : f33965372fdfdb801d5f9b999c91dd591f6c856c
MozReview-Commit-ID: 5Rpdyg7zpNG

--HG--
extra : rebase_source : 1642484993287d489060e95e3fbeb62232b422c6
MozReview-Commit-ID: GoQQRfGRvd4

--HG--
extra : rebase_source : c2d56638e078012766e8f7c9b64de6d3988e6dbc
…e the refactored code. r=liuche

The previous code checked:

if (env.startsWith("MOZ_DISABLE_SWITCHBOARD=")) {
    if (!env.endsWith("=")) {

So it would not pass with the empty String but my previous revision permitted
the empty string.

Practically speaking, I don't think it matters because this is only used in
remoteautomation.py where the value is 1, but better safe than sorry.

MozReview-Commit-ID: DLtmvWlQYs7

--HG--
extra : rebase_source : 3c96cf81f729911bfefcc103f46068bd9b8fb202
MozReview-Commit-ID: 44R0ahE094N

--HG--
extra : rebase_source : a7283f8da674ea315f9fa0ac0dd59dead66f3e80
extra : source : e22b131d462f845529713d8a3e0612525d06b78c
… r=seth,lsalzman.

--HG--
extra : rebase_source : dec917d2efd9a262bd06816dcbb541acd3892340
… use Unused to indicate unsupported units. r=dbaron

MozReview-Commit-ID: 2OjVfafdgG6

--HG--
extra : rebase_source : 37e53646cb493614aea59687fedce7e658c3dc42
MozReview-Commit-ID: 1X1DXa8fEZN

--HG--
extra : rebase_source : 79ab44ea8cbfd5710006731789925daaad80dc3a
--HG--
extra : rebase_source : bad752021d110e22a4942fd23a9ec04c780a677c
BavarianTomcat and others added 27 commits June 7, 2016 12:10
…e out failures in browser_ManifestObtainer_obtain.js
…we are not sandboxed. r=jimm

MozReview-Commit-ID: EpXy9LYXwQL
MozReview-Commit-ID: 3DsyJamjqKy

--HG--
extra : rebase_source : 2d880e37e89f91ceb729b216fe7629ec6d26a13e
…bustage

(because of platforms not supporting wasm at all)

MozReview-Commit-ID: 4GNERAe3YTD

--HG--
extra : rebase_source : 43fd616838fd5fca8d69081461d09b968c3a0622
MozReview-Commit-ID: 6PzUWsZfeZ5

--HG--
extra : amend_source : 3da070432030498bd0417338b415e609f1e29fff
…=erahm

Doubt anybody has compiled with the appropriate #define in a while, and
there's no evidence of the associated DEBUG_* constants being used.
MozReview-Commit-ID: 4V1YcK2thiF

--HG--
extra : rebase_source : d7b574f8a36de604d7d48c33ca8b920a5659dbb5
@mykmelez mykmelez merged commit 960051a into mozilla:master Jun 7, 2016
@mykmelez mykmelez deleted the merge-from-upstream branch June 7, 2016 22:50
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.