You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2015/07/14 19:10:08 UTC
[03/14] incubator-usergrid git commit: Merge branch 'two-dot-o-dev'
into pr/303
Merge branch 'two-dot-o-dev' into pr/303
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/1adcfd29
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/1adcfd29
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/1adcfd29
Branch: refs/heads/observable-query-fix
Commit: 1adcfd292ad42fdc65ace103fb8f3b54e51f2cb4
Parents: 7fbb9f5 a842d57
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Jul 10 16:19:19 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Jul 10 16:19:19 2015 -0600
----------------------------------------------------------------------
.../rx/ObservableToBlockingIteratorFactory.java | 107 ++++++++++++-------
.../persistence/core/rx/OrderedMergeTest.java | 35 ++++--
2 files changed, 96 insertions(+), 46 deletions(-)
----------------------------------------------------------------------