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

Public API changes for 1.1.0 release #3550

Merged
merged 1 commit into from
Dec 3, 2015

Conversation

stealthcode
Copy link

No description provided.

@@ -69,6 +68,7 @@ public void onNext(T t) {
public boolean hasObservers() {
return actual.hasObservers();
}
<<<<<<< HEAD
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merge conflict not resolved; this causes compilation error.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My mistake. Thanks for the clue.

@stealthcode
Copy link
Author

This should be merged immediately after the next minor release (1.0.17). The plan is to have a minor release that is identical to the following major release except for changes to the public api (which should not substantially change functionality).

@akarnokd
Copy link
Member

akarnokd commented Dec 1, 2015

👍

1 similar comment
@stevegury
Copy link
Member

👍

stealthcode pushed a commit that referenced this pull request Dec 3, 2015
Public API changes for 1.1.0 release
@stealthcode stealthcode merged commit 7561c49 into ReactiveX:1.x Dec 3, 2015
@stealthcode
Copy link
Author

Now we need to update the CHANGES.md to reflect the public api changes... That might have been easier in the old format of 1 PR per change. I'll probably do sub-bullets under the PR.

@mattbishop
Copy link

So Release Notes for 1.1.0 state that Single has been promoted out of Beta, but it looks like it is not actually out of beta.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants