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 beta] Maintain Ember.subscribe compatibility #10436

Merged
merged 1 commit into from
Feb 13, 2015

Conversation

jgwhite
Copy link
Contributor

@jgwhite jgwhite commented Feb 12, 2015

Ensures instrument.{subscribe,unsubscribe,reset} aren’t clobbered by stream equivalents.

Addresses #10435

@mixonic
Copy link
Member

mixonic commented Feb 12, 2015

@jgwhite this should be [BUGFIX beta], and may I suggest instrumentationSubscribe etc instead of instrumentSubscribe. The latter sounds like you are instrumenting subscribe, which is not the intent.

Great catch, thanks.

@jgwhite jgwhite changed the title Maintain Ember.subscribe compatibility [BUGFIX beta] Maintain Ember.subscribe compatibility Feb 12, 2015
@jgwhite
Copy link
Contributor Author

jgwhite commented Feb 12, 2015

@mixonic updated the naming, good call. Thanks for the prod on the PR name.

@jgwhite
Copy link
Contributor Author

jgwhite commented Feb 12, 2015

Not completely clear whether these CI failures are a result of the patch or not.

@rwjblue
Copy link
Member

rwjblue commented Feb 12, 2015

I believe that #10437 will fix the issue we are having.

@rwjblue
Copy link
Member

rwjblue commented Feb 12, 2015

@jgwhite - Can you rebase?

@jgwhite
Copy link
Contributor Author

jgwhite commented Feb 13, 2015

@rwjblue done.

rwjblue added a commit that referenced this pull request Feb 13, 2015
[BUGFIX beta] Maintain Ember.subscribe compatibility
@rwjblue rwjblue merged commit ea759a2 into emberjs:master Feb 13, 2015
@rwjblue
Copy link
Member

rwjblue commented Feb 13, 2015

Thank you!

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.

3 participants