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 |
|
Jonas Bonér
|
006f7f5278
|
Added the ErrorHandler notifications to all try-catch blocks
|
2011-03-02 00:14:45 +01:00 |
|
Jonas Bonér
|
df859b38f0
|
Removed logging
|
2011-02-28 22:54:32 +01:00 |
|
Derek Williams
|
7f5966b9de
|
Merge branch 'derekjw-future'
|
2011-02-23 06:05:58 -07:00 |
|
Derek Williams
|
be5da153ee
|
Merge branch 'master' into derekjw-future
|
2011-02-22 18:58:32 -07:00 |
|
Viktor Klang
|
cedaef13f1
|
Merge branch 'wip-ebedd-tune'
|
2011-02-22 13:08:12 +01:00 |
|
Viktor Klang
|
f7abac847a
|
Merge branch 'master' of github.com:jboner/akka into wip-ebedd-tune
|
2011-02-14 23:09:22 +01:00 |
|
Derek Williams
|
d71d648140
|
Merge branch '661-derekjw'
|
2011-02-13 20:01:40 -07:00 |
|
Garrick Evans
|
fa9f7b637d
|
fix tabs; remove debugging log line
|
2011-02-12 10:01:29 -08:00 |
|
Garrick Evans
|
4aae2ba1cf
|
ticket 664 - update continuation handling to (re)support updating timeout
|
2011-02-12 09:57:24 -08:00 |
|
Viktor Klang
|
37c0cd8367
|
Changing to getPathInfo instead of getRequestURI for Mist
|
2011-01-28 12:42:31 +01:00 |
|
Viktor Klang
|
b296afe0ab
|
Merge branch 'remote_deluxe'
|
2011-01-04 15:25:27 +01:00 |
|
Roland Kuhn
|
65b742b192
|
Merge branch 'testkit'
|
2011-01-04 13:51:39 +01:00 |
|
Viktor Klang
|
03f3351708
|
Removing ActorRegistry object, UntypedActor object, introducing akka.actor.Actors for the Java API
|
2011-01-04 13:24:28 +01:00 |
|
Viktor Klang
|
f0e0e927d3
|
Merge with master
|
2011-01-03 15:03:45 +01:00 |
|
Viktor Klang
|
e563e6beb7
|
Making EmbeddedAppServer work without AKKA_HOME
|
2010-12-28 11:36:23 +01:00 |
|
Viktor Klang
|
37513ef6d2
|
Merged with current master
|
2010-12-27 12:12:49 +01:00 |
|
Viktor Klang
|
a642d2ba00
|
Merge branch 'master' of github.com:jboner/akka
|
2010-12-27 10:51:20 +01:00 |
|
Roland Kuhn
|
614dc07502
|
Merge remote branch 'origin/fsmrk2' into testkit
- fix up one implicits clash
|
2010-12-26 22:47:06 +01:00 |
|
Jonas Bonér
|
0bbfcfb2b8
|
Updated the copyright header to 2009-2011
|
2010-12-22 15:35:50 +01:00 |
|
Viktor Klang
|
572b88b1bb
|
Closing ticket 541
|
2010-12-22 15:18:13 +01:00 |
|
Jonas Bonér
|
b930556c15
|
removed trailing spaces
|
2010-12-22 10:23:58 +01:00 |
|
Jonas Bonér
|
1d8435e293
|
Merge branch 'master' of github.com:jboner/akka
|
2010-12-22 08:09:58 +01:00 |
|
Jonas Bonér
|
6c6fa37a24
|
changed config element name
|
2010-12-22 08:07:26 +01:00 |
|
Viktor Klang
|
9d524d9660
|
Merge branch 'release_1_0_RC1'
|
2010-12-13 16:47:17 +01:00 |
|
Jonas Bonér
|
65152c14ab
|
Merge branch 'master' of github.com:jboner/akka
|
2010-12-10 09:00:57 +01:00 |
|
ticktock
|
19d6d8c9b0
|
Merge branch 'master' of github.com:jboner/akka into ticket-538
|
2010-12-09 10:14:49 -05:00 |
|
Viktor Klang
|
72f4c62102
|
Merge branch 'release_1_0_RC1'
|
2010-12-08 10:15:13 +01:00 |
|
Jonas Bonér
|
21d364dcf8
|
Merge branch 'master' of github.com:jboner/akka
|
2010-12-01 15:45:14 +01:00 |
|
Viktor Klang
|
654e81fd87
|
Merge branch 'master' of github.com:jboner/akka
|
2010-12-01 10:17:35 +01:00 |
|
Jonas Bonér
|
d4fd1a28c4
|
Merge branch 'release_1_0_RC1' of github.com:jboner/akka into release_1_0_RC1
|
2010-11-30 12:28:28 +01:00 |
|
Viktor Klang
|
5646fdd7b6
|
Fixing SLF4J logging lib switch, insane API FTL
|
2010-11-30 12:00:58 +01:00 |
|
ticktock
|
6f852c6af2
|
merged module move refactor from master
|
2010-11-28 10:55:06 -05:00 |
|
Viktor Klang
|
cc6c2112c2
|
Switched AkkaLoader to use Switch instead of volatile boolean
|
2010-11-26 12:53:59 +01:00 |
|
Viktor Klang
|
8d1c783e3d
|
Merge branch 'master' of github.com:jboner/akka
|
2010-11-25 16:28:39 +01:00 |
|
momania
|
94cc5a5f39
|
Merge branch 'master' of github.com:jboner/akka
|
2010-11-25 15:09:37 +01:00 |
|
Viktor Klang
|
00fa1758f4
|
Adding AkkaRestServlet that will provide the same functionality as the AkkaServlet - Atmosphere
|
2010-11-25 14:10:53 +01:00 |
|
Viktor Klang
|
c9125b615c
|
Merge branch 'master' of github.com:jboner/akka
|
2010-11-25 10:17:02 +01:00 |
|
Jonas Bonér
|
67a1a5d817
|
removed trailing whitespace
|
2010-11-24 21:05:12 +01:00 |
|
Jonas Bonér
|
7425f43db4
|
tabs to spaces
|
2010-11-24 21:04:33 +01:00 |
|
Viktor Klang
|
ad98692749
|
Merge branch 'master' of github.com:jboner/akka
|
2010-11-24 16:57:07 +01:00 |
|
Jonas Bonér
|
8be39fc5f5
|
Merge branch 'master' of git@github.com:jboner/akka
|
2010-11-24 16:36:43 +01:00 |
|
Jonas Bonér
|
71a192138a
|
uncommented the dataflowstream tests and they all pass
|
2010-11-24 16:36:23 +01:00 |
|
momania
|
b770c56144
|
Merge branch 'master' of git-proxy:jboner/akka
|
2010-11-24 15:45:15 +01:00 |
|
Viktor Klang
|
a10c78dd7c
|
Merge with master
|
2010-11-24 15:05:29 +01:00 |
|
Viktor Klang
|
1bbe550345
|
Fixing all %s into {} for logging
|
2010-11-24 13:53:53 +01:00 |
|