Viktor Klang
8482ede8a9
Merge branch 'master' of github.com:jboner/akka
2011-05-03 16:36:42 +02:00
Eugene Vigdorchik
d2a9c2b004
Merge branch 'master' of http://github.com/jboner/akka
2011-05-03 14:10:00 +04:00
Viktor Klang
508c442669
Merge branch 'master' of github.com:jboner/akka
2011-05-02 17:14:04 +02:00
Derek Williams
4376bd5ee7
Merge branch 'master' into delimited-continuations
...
Conflicts:
akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
akka-actor/src/main/scala/akka/dispatch/Future.scala
project/build/AkkaProject.scala
2011-04-30 08:59:45 -06:00
Viktor Klang
371bf31cd8
Fixing ticket #813
2011-04-28 16:03:21 +02:00
Viktor Klang
e916c98075
Merge branch 'ticket-812'
2011-04-28 16:01:23 +02:00
Viktor Klang
7614559560
Fixing tickets #816 , #814 , #817 and Dereks fixes on #812
2011-04-28 16:01:11 +02:00
Viktor Klang
db34762cca
Merge branch 'master' of github.com:jboner/akka
2011-04-27 11:10:02 +02:00
Patrik Nordwall
98b3f5f55a
Added parens to override of preStart and postStop
2011-04-26 20:31:08 +02:00
Jonas Bonér
195ba56fcd
Merge branch 'master' of github.com:jboner/akka
2011-04-23 11:57:20 +02:00
Roland
a73142d0b8
Merge branch 'future-rk'
2011-04-23 11:51:46 +02:00
Jonas Bonér
250a9b1631
Merge branch 'master' of github.com:jboner/akka
2011-04-23 11:31:14 +02:00
Roland
c74983f519
Merge branch 'wip-testkit2'
...
- also fix some sphinx-build warnings/errors
2011-04-23 11:23:50 +02:00
Roland
65150970dc
merge master and wip-testkit into wip-testkit2
2011-04-21 21:36:28 +02:00
Patrik Nordwall
cdb18c43e0
Merge branch 'master' of github.com:jboner/akka
2011-04-20 20:49:23 +02:00
Jonas Bonér
a538aba7cc
Merge branch 'eclipse-tutorial'
2011-04-20 18:37:39 +02:00
Viktor Klang
7a5103fa1f
Merge branch 'master' of github.com:jboner/akka
2011-04-20 11:08:35 +02:00
Jonas Bonér
6a66f42645
Merge branch 'master' of github.com:jboner/akka
2011-04-20 10:04:54 +02:00
Jonas Bonér
a96fc8d66a
Merge branch 'master' of github.com:jboner/akka
2011-04-20 09:29:29 +02:00
Viktor Klang
75d4d67e86
Merge branch 'master' of github.com:jboner/akka
2011-04-19 14:16:12 +02:00
Viktor Klang
27c2a67db7
Merge branch 'master' of github.com:jboner/akka
2011-04-19 13:27:31 +02:00
Jonas Bonér
3165d25154
merge with upstream
2011-04-18 13:33:36 +02:00
Roland Kuhn
fb402851ea
Merge branch 'master' into wip-testkit
2011-04-15 20:35:55 +02:00
Patrik Nordwall
1e4b36c680
Added parens to start
2011-04-12 09:56:17 +02:00
Jonas Bonér
d109fb65c2
Merge branch 'master' of github.com:jboner/akka
2011-04-01 22:59:56 +02:00
Derek Williams
c2cdbe7280
Merge branch 'master' into ticket-622
2011-04-01 12:26:52 -06:00
Derek Williams
fdb76eb8d0
Merge remote-tracking branch 'origin/master' into ticket-622
2011-03-30 22:07:13 -06:00
Jonas Bonér
75d6901050
Merge branch 'master' of github.com:jboner/akka
2011-03-30 21:19:32 +02:00
Jonas Bonér
18ad1e6e15
Added check to ensure that messages are not null. Also cleaned up misc code
2011-03-30 15:12:58 +02:00
Peter Vlugter
44dbfde32d
Merge branch 'master' into wip-2.9.0
2011-03-29 20:55:19 +13:00
Peter Vlugter
819641133f
Merge branch 'master' into wip-2.9.0
2011-03-28 20:23:37 +13:00
Peter Vlugter
2fa91a6fd2
Merge branch 'master' into wip-2.9.0
2011-03-28 09:38:56 +13:00
Viktor Klang
e00b333d7f
Merging in master
2011-03-26 19:40:36 +01:00
Jonas Bonér
f4a9cb35b0
Merge branch 'master' of github.com:jboner/akka
2011-03-24 10:30:53 +01:00
Viktor Klang
5c2405eb46
Merge branch 'master' of github.com:jboner/akka
2011-03-23 16:03:24 +01:00
Viktor Klang
36ce48e5ff
Moving Initializer to akka-kernel, add manually for other uses, removing ListWriter, changing akka-http to depend on akka-actor instead of akka-remote, closing ticket #716
2011-03-23 15:44:20 +01:00
Jonas Bonér
5a6984ecc6
Merge branch 'master' of github.com:jboner/akka
2011-03-23 15:12:32 +01:00
Jonas Bonér
c02cfca940
Moved EventHandler to 'akka.event' plus added 'error' method without exception param
2011-03-23 15:12:09 +01:00
Viktor Klang
97fc6969fd
Merge branch 'master' of github.com:jboner/akka
2011-03-22 22:13:00 +01:00
Jonas Bonér
e3c454e0e8
Merge branch 'master' of github.com:jboner/akka
2011-03-22 18:59:53 +01:00
Martin Krasser
ab71d67a30
Merge branch '667-krasserm'
2011-03-22 09:34:33 +01:00
Viktor Klang
527d5b3226
Merge branch 'master' of github.com:jboner/akka
2011-03-19 17:52:59 +01:00
Jonas Bonér
93c77ddc34
Merge branch 'master' of github.com:jboner/akka
2011-03-19 12:22:17 +01:00
Jonas Bonér
a5a21e9f4a
Fixed bug with restarting supervised supervisor that had done linking in constructor + Changed all calls to EventHandler to use direct 'error' and 'warning' methods for improved performance
2011-03-18 23:04:48 +01:00
Viktor Klang
5ddc880199
Merge branch 'master' of github.com:jboner/akka
2011-03-18 11:24:24 +01:00
Viktor Klang
1f46bb989d
Merge branch 'master' of github.com:jboner/akka
2011-03-17 22:58:28 +01:00
Roland Kuhn
69d4627872
Merge branch 'wip-CallingThreadDispatcher'
...
Conflicts:
akka-actor/src/test/scala/akka/dispatch/ActorModelSpec.scala
project/build/AkkaProject.scala
both resolved by "union" approach
- change wavesOfActors test for CTD: scheduling SHUTDOWN 10000 times does not
work so well...
- add executeFuture with trivial implementation, TBC
2011-03-17 22:18:39 +01:00
Viktor Klang
b5f552e77b
Moving AkkaLoader from akka.servlet in akka-http to akka.util, closing ticket #701
2011-03-14 17:53:35 +01:00
Viktor Klang
5d70243161
Merge with master
2011-03-14 16:29:22 +01:00
Jonas Bonér
4c0c427594
Merge branch 'master' of github.com:jboner/akka
2011-03-14 10:45:55 +01:00
