From 3d563194b237ce643882007b7e3159d49f9b8aa5 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 13 Aug 2014 23:15:29 -0700 Subject: [PATCH 1/4] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/e4a068c1ec04 Author: Luke Chang Desc: Merge pull request #22772 from luke-chang/1050682_sms_wrong_multiline_style Bug 1050682 - [Messages] The recipient container will remain multiline style when removing the last recipient from opened panel, r=steveck-chung ======== https://hg.mozilla.org/integration/gaia-central/rev/4c487cca6baf Author: Luke Chang Desc: Bug 1050682 - [Messages] The recipient container will remain multiline style when removing the last recipient from opened panel ======== https://hg.mozilla.org/integration/gaia-central/rev/6b71ee9997c5 Author: Julien Wajsberg Desc: Merge pull request #22843 from julienw/1046828-fix-marionette-tests Bug 1046828 - [Notifications API] We should never send the "show" event ... ======== https://hg.mozilla.org/integration/gaia-central/rev/681fd8fa0f10 Author: Julien Wajsberg Desc: Bug 1046828 - [Notifications API] We should never send the "show" event using system messages at a reboot r=mhenretty Fix marionette tests --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index a0ce63d4cb4..a4c27d23a64 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "2fb6119da922ebdab70c79e7f515f49fa582b2c5", + "revision": "e4a068c1ec044595738a3698fa32840764dd7ca0", "repo_path": "/integration/gaia-central" } From 709289cc3a58b3c9ef665624cfac3e687e1ca227 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 13 Aug 2014 23:21:25 -0700 Subject: [PATCH 2/4] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 3a4f590e65c..e548f8d03df 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index d9f07e68f6d..ff05f561932 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index ce0d311ed4d..9f8636fe208 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 3a4f590e65c..e548f8d03df 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index adf020c0217..f8566c72891 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 9ba977901cd..b48762965bc 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 814bba4a6cb..1e2caf145be 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index a1ce7155d5d..bb1794d6ea6 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index ce0fbfcb823..a37c9d18aa3 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 1ab5b006d42b6b5a45f9e1982677ddec3e617775 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 14 Aug 2014 00:30:26 -0700 Subject: [PATCH 3/4] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/b6ce93c01bda Author: Yuren Ju Desc: Merge pull request #22835 from sudheesh001/Patch_1032033 Fixes Bug 1032033, build/test/integration/helper.js r=yurenju ======== https://hg.mozilla.org/integration/gaia-central/rev/6013ce199eeb Author: sudheesh001 Desc: Fixes Bug 1032033, build/test/integration/helper.js r=yurenju --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index a4c27d23a64..20a6aebd694 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "e4a068c1ec044595738a3698fa32840764dd7ca0", + "revision": "b6ce93c01bda41c1536d905d2b358e0227b962d2", "repo_path": "/integration/gaia-central" } From a31988a8dcfa4f930ebfad6731f19028d2635932 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 14 Aug 2014 00:36:47 -0700 Subject: [PATCH 4/4] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index e548f8d03df..b99372bc1b8 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index ff05f561932..6f5c182bed2 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 9f8636fe208..35daeccbf03 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index e548f8d03df..b99372bc1b8 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index f8566c72891..2c34d0a1f74 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index b48762965bc..5ba75b89f00 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 1e2caf145be..ef05a026913 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index bb1794d6ea6..3ebd558299f 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index a37c9d18aa3..a0108ed55fd 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - +