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

Clean merge of rxjava-async-util #706

Closed

Conversation

benjchristensen
Copy link
Member

Manual merge of #704 by cherry picking relevant changes.

benjchristensen and others added 4 commits December 27, 2013 10:55
Home for async utility functions with juc.Future, Actions, Functions etc that don’t need to be in rxjava-core.

As per discussions at:

- ReactiveX#646 (comment)
- ReactiveX#645 (comment)
- ReactiveX#622 (comment)
Home for async utility functions with juc.Future, Actions, Functions etc that don’t need to be in rxjava-core.

As per discussions at:

- ReactiveX#646 (comment)
- ReactiveX#645 (comment)
- ReactiveX#622 (comment)
- To clean up the pull request I cherry picked the single commit with actual changes to avoid the merges that affected lots of other files.
- The original commit also included conflicting and unrelated changes to Observable and ObservableTests that I skipped
Home for async utility functions with juc.Future, Actions, Functions etc that don’t need to be in rxjava-core.

As per discussions at:

- ReactiveX#646 (comment)
- ReactiveX#645 (comment)
- ReactiveX#622 (comment)
@cloudbees-pull-request-builder

RxJava-pull-requests #623 SUCCESS
This pull request looks good

- To clean up the pull request I cherry picked the single commit with actual changes to avoid the merges that affected lots of other files.
- The original commit also included conflicting and unrelated changes to Observable and ObservableTests that I skipped
Home for async utility functions with juc.Future, Actions, Functions etc that don’t need to be in rxjava-core.

As per discussions at:

- ReactiveX#646 (comment)
- ReactiveX#645 (comment)
- ReactiveX#622 (comment)
- To clean up the pull request I cherry picked the single commit with actual changes to avoid the merges that affected lots of other files.
- The original commit also included conflicting and unrelated changes to Observable and ObservableTests that I skipped
@benjchristensen
Copy link
Member Author

Ugh ... broke this pull request.

@cloudbees-pull-request-builder

RxJava-pull-requests #624 FAILURE
Looks like there's a problem with this pull request

@benjchristensen benjchristensen deleted the merge-async-util branch December 30, 2013 17:46
@benjchristensen
Copy link
Member Author

Looks like I got a properly cleaned merge in #707

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