index
:
scala
2.10.x
2.11.x
2.12.x
2.8.x
2.9.x
SI-10027-test
gh-pages
javadoc
javadoc-dirty-hack
legacy/msil
scaladoc-include-assets
script-linux
wip-javadoc
The Scala programming language
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
src
/
library
/
scala
/
concurrent
/
Promise.scala
Commit message (
Expand
)
Author
Age
Files
Lines
*
Merge commit 'ad845ff' into merge/2.10.x-to-2.11.x-20150224
Jason Zaugg
2015-02-24
1
-4
/
+1
|
\
|
*
SI-8689 Avoid internal error in Promise after sequence of completions
Viktor Klang
2015-02-04
1
-5
/
+2
*
|
Convenience methods from Try[T] => {Future, Promise}[T]
Jason Zaugg
2013-09-19
1
-2
/
+9
*
|
Cull extraneous whitespace.
Paul Phillips
2013-09-18
1
-17
/
+4
*
|
fix Promise scaladoc
xuwei-k
2013-07-27
1
-2
/
+2
*
|
Deprecate parameter names in scala.concurrent
Viktor Klang
2013-05-16
1
-3
/
+3
|
/
*
Brings all copyrights (in comments) up-to-date, from 2011/12 to 2013
Heather Miller
2012-11-02
1
-1
/
+1
*
Basing Futures on Try instead of Either
Heather Miller
2012-08-04
1
-8
/
+10
*
Collection of updates to SIP-14 (scala.concurrent)
Havoc Pennington
2012-07-09
1
-0
/
+9
*
Move implicit ExecutionContext to be determined by lexical scope
phaller
2012-05-24
1
-6
/
+8
*
Address doc comment rot in the standard library.
Jason Zaugg
2012-05-13
1
-4
/
+4
*
Removing the wrap-method from Promise
Viktor Klang
2012-04-15
1
-7
/
+0
*
Introducing tryCompleteWith for symmetry and for the possibility to treat rac...
viktorklang
2012-04-15
1
-0
/
+9
*
Streamlining calls so success/failure go through complete, also made sure com...
viktorklang
2012-04-15
1
-13
/
+7
*
Making changes in the scala.concurrent package.
aleksandar
2012-04-12
1
-3
/
+15
*
Remedies Try/Either signature disparity for source compat. w/ Akka
Heather Miller
2012-04-03
1
-11
/
+6
*
Work on source compatibility between akka and scala futures.
Aleksandar Prokopec
2012-03-28
1
-6
/
+10
*
Whitespace commit.
Paul Phillips
2012-02-29
1
-32
/
+32
*
Replaced Either with Try throughout scala.concurrent.
Heather Miller
2012-01-31
1
-5
/
+5
*
Removed the nondeterministic implicit. Added rescue.
aleksandar
2012-01-24
1
-7
/
+3
*
Fixed the way callbacks are handled. Removed executor from base future trait.
aleksandar
2012-01-23
1
-2
/
+2
*
Add NonDeterministic evidence needed to call nondeterministic methods.
aleksandar
2012-01-19
1
-7
/
+23
*
Add implicit conversion for futures that enables calling nondeterministic met...
aleksandar
2012-01-19
1
-2
/
+2
*
Fix `all` combinator on futures, refactor execution context, remove disabled ...
aleksandar
2012-01-19
1
-1
/
+0
*
Added implementations for any and find on collections of futures.
Heather Miller
2012-01-19
1
-1
/
+4
*
Migrate akka promises. Changes to some of the interfaces.
aleksandar
2012-01-13
1
-13
/
+5
*
Work in progress on porting akka promises and futures.
aleksandar
2012-01-13
1
-2
/
+31
*
Port of akka Future implementation in progress.
aleksandar
2012-01-12
1
-4
/
+23
*
Change promise fulfill and break to success and failure.
aleksandar
2011-12-12
1
-2
/
+2
*
Merge branch 'execution-context' of https://github.com/phaller/scala into exe...
Aleksandar Prokopec
2011-12-07
1
-2
/
+12
|
\
|
*
Fix merge conflict
Philipp Haller
2011-12-07
1
-3
/
+7
|
|
\
|
*
|
Add promise implementation. Move fork/join implementation into default packag...
Philipp Haller
2011-12-07
1
-4
/
+11
*
|
|
Some docs fixes.
Aleksandar Prokopec
2011-12-07
1
-1
/
+1
|
|
/
|
/
|
*
|
Minor changes with the docs.
Aleksandar Prokopec
2011-12-07
1
-6
/
+7
|
/
*
Got the futures and execution contexts related code to compile.
Aleksandar Prokopec
2011-12-07
1
-0
/
+4
*
Adding some comments to block on. Removing timeout parameters.
Aleksandar Prokopec
2011-12-06
1
-1
/
+4
*
The default implementations for some of the future methods.
Aleksandar Prokopec
2011-12-05
1
-0
/
+30
*
Migration of scala.concurrent to clean fork of new Scala repo.
Philipp Haller
2011-12-05
1
-0
/
+30