Merge m-c to inbound on a CLOSED TREE.
authorRyan VanderMeulen <ryanvm@gmail.com>
Wed, 17 Sep 2014 16:35:58 -0400
changeset 205903 c9115053bdc6c7cdfd25daf174320f674637c357
parent 205902 26d86ab7c4f35da9e7db86c1e0e7cf2203f4bbd6 (current diff)
parent 205837 4f2cac8d72da0dbf8ab097728ea5d788fa0e906d (diff)
child 205904 e31e24c2bd280317c72d0aa4f2f235f08cb267fc
push id27507
push userryanvm@gmail.com
push dateThu, 18 Sep 2014 02:16:54 +0000
treeherdermozilla-central@488d490da742 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone35.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge m-c to inbound on a CLOSED TREE.
--- a/browser/base/content/test/social/browser.ini
+++ b/browser/base/content/test/social/browser.ini
@@ -38,16 +38,17 @@ skip-if = e10s # Bug 915547 (social prov
 [browser_social_chatwindow.js]
 skip-if = e10s # Bug 915547 (social providers don't install)
 [browser_social_chatwindow_resize.js]
 skip-if = e10s # Bug 915547 (social providers don't install)
 [browser_social_chatwindowfocus.js]
 skip-if = e10s # Bug 915547 (social providers don't install)
 [browser_social_errorPage.js]
 [browser_social_flyout.js]
+skip-if = e10s # when we backed out bug 1047603, this test broke.
 [browser_social_isVisible.js]
 [browser_social_marks.js]
 skip-if = e10s # Bug 915547 (social providers don't install)
 [browser_social_multiprovider.js]
 [browser_social_multiworker.js]
 [browser_social_perwindowPB.js]
 [browser_social_sidebar.js]
 [browser_social_status.js]