Clean merge of rxjava-async-util#706
Closed
benjchristensen wants to merge 8 commits intoReactiveX:masterfrom
Closed
Clean merge of rxjava-async-util#706benjchristensen wants to merge 8 commits intoReactiveX:masterfrom
benjchristensen wants to merge 8 commits intoReactiveX:masterfrom
Conversation
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)
|
RxJava-pull-requests #623 SUCCESS |
- 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
Member
Author
|
Ugh ... broke this pull request. |
|
RxJava-pull-requests #624 FAILURE |
Member
Author
|
Looks like I got a properly cleaned merge in #707 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Manual merge of #704 by cherry picking relevant changes.