author B2G Bumper Bot <>
Fri, 07 Aug 2015 03:25:27 -0700
changeset 288431 b37ca53168cf1c1425e99577347dda3968008777
parent 288162 2be4be656c7f7fee3ecd96942b6263d051d8db8d
child 288705 7308dd0a6c3b7049dbd8346c7f435c5e03500b65
permissions -rw-r--r--
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== Author: Carsten Book <> Desc: Merge pull request #31269 from snowmantw/bug1191858 Bug 1191858 - remove the incorrect promise in the test. r=julienw ======== Author: Greg Weng <> Desc: Bug 1191858 - remove the incorrect promise in the test

# To trigger a clobber replace ALL of the textual description below,
# giving a bug number and a one line description of why a clobber is
# required. Modifying this file will make configure check that a
# clobber has been performed before the build can continue.
# MERGE NOTE: When merging two branches that require a CLOBBER, you should
#             merge both CLOBBER descriptions, to ensure that users on
#             both branches correctly see the clobber warning.
#                  O   <-- Users coming from both parents need to Clobber
#               /     \
#          O               O
#          |               |
#          O <-- Clobber   O  <-- Clobber
# Note: The description below will be part of the error message shown to users.
# Modifying this file will now automatically clobber the buildbot machines \o/

# Are you updating CLOBBER because you think it's needed for your WebIDL
# changes to stick? As of bug 928195, this shouldn't be necessary! Please
# don't change CLOBBER for WebIDL changes any more.

Bug 1191675 to fix xpcshell failures