Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BUGFIX release-1-13] Updated backburner.js. Backported from master. #12449

Merged
merged 1 commit into from
Oct 7, 2015
Merged

[BUGFIX release-1-13] Updated backburner.js. Backported from master. #12449

merged 1 commit into from
Oct 7, 2015

Conversation

workmanw
Copy link

@workmanw workmanw commented Oct 6, 2015

Addresses #12193 and possibly #10479.

@workmanw
Copy link
Author

workmanw commented Oct 6, 2015

:( It's not clear what failed.

One error was:

TypeError: Cannot read property 'QUnit' of undefined

Seems like something else going on there.

Second error was timeouts:
screen shot 2015-10-06 at 5 16 30 pm

Maybe it just needs a kick 👞

@rwjblue
Copy link
Member

rwjblue commented Oct 6, 2015

Nah, it's failing upstream. I just fixed node tests on master yesterday. I need to backport that fix to beta, release, and release-1-13.

@workmanw
Copy link
Author

workmanw commented Oct 6, 2015

@rwjblue Okay cool. Will rebase this when the other fix(es) have been backported.

@workmanw
Copy link
Author

workmanw commented Oct 6, 2015

@rwjblue Actually, I'd be happy to open PRs to backport those fixes across those branches if you think it's straightforward (I don't have any specific knowledge of the fixes).

@rwjblue
Copy link
Member

rwjblue commented Oct 6, 2015

#12440

@rwjblue
Copy link
Member

rwjblue commented Oct 7, 2015

Can you rebase?

@workmanw
Copy link
Author

workmanw commented Oct 7, 2015

@rwjblue Rebased.

rwjblue added a commit that referenced this pull request Oct 7, 2015
[BUGFIX release-1-13] Updated backburner.js. Backported from master.
@rwjblue rwjblue merged commit 33df9d9 into emberjs:release-1-13 Oct 7, 2015
@rwjblue
Copy link
Member

rwjblue commented Oct 7, 2015

Thank you!

@workmanw
Copy link
Author

workmanw commented Oct 7, 2015

You're welcome!

I'd be happy to back port these node test fixes to beta and release. I'll do that right meow. 😸

One question, I'll be looking to use https://github.com/components/ember/tree/release-1-13. Does that just push automagically?

@workmanw workmanw deleted the backburner-update branch October 8, 2015 01:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants