Merge branch 'master' into wip-nostart

This commit is contained in:
Viktor Klang 2011-09-08 17:22:52 +02:00
commit 6114df1efd
9 changed files with 186 additions and 169 deletions

View file

@ -568,5 +568,5 @@ trait ScatterGatherRouter extends BasicRouter with Serializable {
*/
class ScatterGatherFirstCompletedRouter extends RoundRobinRouter with ScatterGatherRouter {
protected def gather[S, G >: S](results: Iterable[Future[S]]): Future[G] = Futures.firstCompletedOf(results)
protected def gather[S, G >: S](results: Iterable[Future[S]]): Future[G] = Future.firstCompletedOf(results)
}