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.

Sign up for GitHub

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

Jump to bottom

Pull 267 - Merge combineLatest #303

Merged
merged 10 commits into from
Jul 5, 2013
Merged

Pull 267 - Merge combineLatest #303

merged 10 commits into from
Jul 5, 2013

Commits on Apr 6, 2013

  1. avoiding some synchronization on combineLatest

    jmhofer committed Apr 6, 2013
    Configuration menu
    Copy the full SHA
    eb5df87 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2013

  1. Merge branch 'master' into combineLatest

    jmhofer committed Apr 22, 2013
    Configuration menu
    Copy the full SHA
    fc99abe View commit details
    Browse the repository at this point in the history

Commits on May 8, 2013

  1. Merge branch 'master' into combineLatest

    jmhofer committed May 8, 2013
    Configuration menu
    Copy the full SHA
    7ce53f0 View commit details
    Browse the repository at this point in the history

  2. handled combine functions that throw exceptions and added a test agai… 

    …nst this case
    jmhofer committed May 8, 2013
    Configuration menu
    Copy the full SHA
    4250d27 View commit details
    Browse the repository at this point in the history

  3. added combineLatest static methods to Observable

    jmhofer committed May 8, 2013
    Configuration menu
    Copy the full SHA
    bb39cac View commit details
    Browse the repository at this point in the history

Commits on May 9, 2013

  1. Got rid of the last remnants of synchronization in favor of a concurr… 

    …ent map.
    jmhofer committed May 9, 2013
    Configuration menu
    Copy the full SHA
    ba41db1 View commit details
    Browse the repository at this point in the history

  2. Fixed a javadoc parameter.

    jmhofer committed May 9, 2013
    Configuration menu
    Copy the full SHA
    d5259ca View commit details
    Browse the repository at this point in the history

  3. improved generics for combineLatest (PECS principle)

    jmhofer committed May 9, 2013
    Configuration menu
    Copy the full SHA
    1500859 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2013

  1. Tried to adapt according to Ben's review comments.

    jmhofer committed May 11, 2013
    Configuration menu
    Copy the full SHA
    797bf4d View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2013

  1. Merge branch 'combineLatest' of git://github.com/jmhofer/RxJava into … 

    …pull-267-combineLatest

Conflicts:
	rxjava-core/src/main/java/rx/Observable.java
	rxjava-core/src/main/java/rx/operators/OperationCombineLatest.java
    @benjchristensen
    benjchristensen committed Jul 5, 2013
    Configuration menu
    Copy the full SHA
    c88f36e View commit details
    Browse the repository at this point in the history