scala - The Scala programming language

	Commit message (Expand)	Author	Age	Files	Lines
*-.	Merge remote-tracking branches 'hubertp/issue/5452' and 'hubertp/issue/5493' ...	Paul Phillips	2012-02-17	10	-10/+41
\|\ \
\| \| *	Closes #5497.	Hubert Plociniczak	2012-02-18	5	-2/+22
\| * \|	Closes #5452.	Hubert Plociniczak	2012-02-17	5	-8/+19
\| \|/
* \|	Merge remote-tracking branch 'scalamacros/pullrequest/macros' into develop	Paul Phillips	2012-02-17	34	-31/+242
\|\ \
\| * \|	Fixes miscellaneous macro bugs	Eugene Burmako	2012-02-17	34	-31/+242
\| \|/
* \|	Merge branch 'develop'	Paul Phillips	2012-02-17	36	-117/+3516
\|\ \
\| * \|	Fix for "type _$1 defined twice".	Paul Phillips	2012-02-17	8	-144/+134
\| * \|	Merge remote-tracking branch 'phaller/execution-context' into feb17-alex	Paul Phillips	2012-02-17	33	-116/+3525
\| \|\ \
\| \| * \|	Disable execution context and futures implementation in the default package.	Aleksandar Prokopec	2012-02-16	12	-28/+30
\| \| * \|	Merge branch 'master' into execution-context	Aleksandar Prokopec	2012-02-16	643	-9625/+16626
\| \| \|\\|
\| \| * \|	Change the default reportFailure implementation.	Aleksandar Prokopec	2012-02-03	1	-2/+3
\| \| * \|	Fix typo in Future trait. Simplify recoverWith.	Philipp Haller	2012-02-03	1	-5/+2
\| \| * \|	Rename to recoverWith and fallbackTo in Future.	aleksandar	2012-02-01	1	-2/+2
\| \| * \|	Replaced Either with Try throughout scala.concurrent.	Heather Miller	2012-01-31	9	-115/+122
\| \| * \|	Add some missing methods, remove obsolete methods in futures.	aleksandar	2012-01-30	6	-36/+41
\| \| * \|	Refactor the Try monad a bit.	aleksandar	2012-01-30	1	-45/+37
\| \| * \|	Changed the comments a bit, removed on* methods on Try.	aleksandar	2012-01-30	1	-55/+32
\| \| * \|	Added first cut of Try type, refactored from twitter util.	Heather Miller	2012-01-30	1	-0/+196
\| \| * \|	Merge branch 'execution-context' of https://github.com/phaller/scala into exe...	Vojin Jovanovic	2012-01-27	1	-20/+66
\| \| \|\ \
\| \| \| * \|	Implement the ensure and andThen methods on futures.	aleksandar	2012-01-27	1	-1/+56
\| \| \| * \|	Change the implementation of the future failed projection.	aleksandar	2012-01-27	1	-20/+11
\| \| * \| \|	Merge branch 'master' into execution-context	Vojin Jovanovic	2012-01-25	232	-1921/+8738
\| \| \|\ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| * \| \|	Removed the nondeterministic implicit. Added rescue.	aleksandar	2012-01-24	6	-54/+74
\| \| * \| \|	Fixed the way callbacks are handled. Removed executor from base future trait.	aleksandar	2012-01-23	4	-14/+13
\| \| * \| \|	Add implicit for duration.	aleksandar	2012-01-20	1	-0/+7
\| \| * \| \|	Add NonDeterministic evidence needed to call nondeterministic methods.	aleksandar	2012-01-19	6	-54/+91
\| \| * \| \|	Add implicit conversion for futures that enables calling nondeterministic met...	aleksandar	2012-01-19	4	-100/+113
\| \| * \| \|	Deprecating some traits in scala.concurrent.	aleksandar	2012-01-19	10	-5/+23
\| \| * \| \|	Fix `all` combinator on futures, refactor execution context, remove disabled ...	aleksandar	2012-01-19	7	-1262/+88
\| \| * \| \|	Added implementations for any and find on collections of futures.	Heather Miller	2012-01-19	3	-7/+55
\| \| * \| \|	Refactor concurrent package and execution contexts.	aleksandar	2012-01-16	7	-55/+101
\| \| * \| \|	Work in progress.	brijest	2012-01-16	6	-19/+48
\| \| * \| \|	Add execution context implementation to akka futures.	aleksandar	2012-01-16	3	-32/+163
\| \| * \| \|	Migrate akka promises. Changes to some of the interfaces.	aleksandar	2012-01-13	10	-51/+250
\| \| * \| \|	Work in progress on porting akka promises and futures.	aleksandar	2012-01-13	7	-184/+231
\| \| * \| \|	Port of akka Future implementation in progress.	aleksandar	2012-01-12	5	-17/+283
\| \| * \| \|	Refactor await calls for awaitable objects to ready and result calls.	aleksandar	2012-01-12	4	-117/+123
\| \| * \| \|	Refactor blockable to awaitable on several places.	aleksandar	2012-01-12	4	-6/+8
\| \| * \| \|	Merge branch 'execution-context' of github.com:phaller/scala into execution-c...	aleksandar	2012-01-12	318	-5537/+8228
\| \| \|\ \ \
\| \| \| * \| \|	Update Future.onSuccess to take a PartialFunction.	Philipp Haller	2012-01-12	1	-7/+9
\| \| \| * \| \|	Merge branch 'master' into execution-context	Vojin Jovanovic	2012-01-09	317	-5526/+8219
\| \| \| \|\ \ \
\| \| * \| \| \| \|	Changing trait CanBlock name to CanAwait.	aleksandar	2012-01-12	4	-3/+9
\| \| \|/ / / /
\| \| * \| \| \|	Make base TCK more uniform with Akka TCK	Philipp Haller	2011-12-13	1	-3/+4
\| \| * \| \| \|	Add test for recover to Akka TCK	Philipp Haller	2011-12-13	2	-4/+25
\| \| * \| \| \|	Force output of exception in assert. Add tests for recover.	Philipp Haller	2011-12-13	1	-2/+33
\| \| * \| \| \|	Add tests for blocking/await to Akka version of the TCK	Philipp Haller	2011-12-13	1	-6/+37
\| \| * \| \| \|	Merge branch 'execution-context' of github.com:phaller/scala into execution-c...	aleksandar	2011-12-13	1	-0/+338
\| \| \|\ \ \ \
\| \| \| * \| \| \|	Add Akka version of Futures TCK.	Philipp Haller	2011-12-13	1	-0/+338
\| \| * \| \| \| \|	Change promise method signature.	aleksandar	2011-12-13	2	-2/+2
\| \| \|/ / / /
\| \| * \| \| \|	Add test cases for blocking. Fix in the failed projection.	aleksandar	2011-12-13	3	-9/+37