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
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
Jonas Bonér
ba691475bd
Changed API for EventHandler and added support for log levels
2011-03-14 10:45:49 +01:00
Viktor Klang
a8d56cb641
Merge branch 'master' of github.com:jboner/akka
2011-03-14 08:30:12 +01:00
Martin Krasser
7e6b0d6ec2
Merge branch '647-krasserm'
2011-03-13 06:55:57 +01:00
Heiko Seeberger
101fb692dc
re #689 : Verified config for akka-http.
2011-03-08 15:23:05 +01:00
Derek Williams
4b5d6e4d1e
Merge branch 'master' into derekjw-future-dispatch
2011-03-07 18:57:08 -07:00
Viktor Klang
5f0d0288af
Merge branch 'master' of github.com:jboner/akka
2011-03-07 13:50:28 +01:00
Viktor Klang
d36c1cb9b8
Moving most of the Jersey and Jetty deps into MicroKernel (akka-modules), closing #593
2011-03-07 13:49:33 +01:00
Derek Williams
0948d997ad
Merge branch 'master' into derekjw-future-dispatch
...
Conflicts:
akka-actor/src/test/scala/akka/dispatch/FutureSpec.scala
2011-03-04 16:12:32 -07:00
Jonas Bonér
c5b14b564a
merged with upstream
2011-03-04 16:50:35 +01:00
Jonas Bonér
6d27778409
Merge branch '0deps', remote branch 'origin' into 0deps
2011-03-04 16:15:07 +01:00
Derek Williams
cc57b1efb0
Merge remote-tracking branch 'origin/0deps' into 0deps-future-dispatch
2011-03-03 15:13:12 -07:00
Derek Williams
7187c8df63
Merge remote-tracking branch 'origin/0deps' into 0deps-future-dispatch
...
Conflicts:
akka-actor/src/main/scala/akka/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcher.scala
akka-actor/src/main/scala/akka/dispatch/Future.scala
akka-actor/src/main/scala/akka/dispatch/HawtDispatcher.scala
2011-03-02 16:44:44 -07:00
Viktor Klang
893ccd5042
Merge remote branch 'origin/0deps' into 0deps
2011-03-02 18:48:43 +01:00
Jonas Bonér
a58cd8534f
merged with upstream
2011-03-02 18:37:41 +01:00
Jonas Bonér
93bdb33e8c
Renamed to EventHandler and added 'info, debug, warning and error'
2011-03-02 18:19:17 +01:00
Jonas Bonér
41700c181f
Merge branch 'master' of github.com:jboner/akka
2011-03-02 00:17:01 +01:00
