Commit graph

435 commits

Author SHA1 Message Date
Viktor Klang
d260e6268e Fixing bugs in actorref creation, or rather, glitches 2011-06-06 16:48:25 -07:00
Viktor Klang
e0dd6ba7f8 Some more minor code cleanups of Mist 2011-06-05 23:17:22 -07:00
Viktor Klang
7b32dd8e1a Cleaning up some Mist code 2011-06-05 22:03:05 -07:00
Viktor Klang
3d50a412bf Removing the Jersey Http Security Module plus the AkkaRestServlet 2011-06-05 19:29:46 -07:00
Viktor Klang
7fa79ac084 Adding support for specifying the root endpoint id in web.xml for Mist 2011-06-05 19:02:23 -07:00
Jonas Bonér
76fb2e127a Merge branch 'master' of github.com:jboner/akka 2011-05-20 14:36:54 +02:00
Viktor Klang
c03cfcf2fd Replacing hook + provider with just a PartialFunction[String,ActorRef], closing ticket #749 2011-05-20 13:56:47 +02:00
Viktor Klang
51f7d46781 Merge branch 'master' of github.com:jboner/akka 2011-05-18 17:45:36 +02:00
Viktor Klang
a8750fbf01 Merge with master 2011-05-18 17:45:17 +02:00
Jonas Bonér
19f447cb10 merged with scalariform branch 2011-05-18 17:34:27 +02:00
Jonas Bonér
c7dad93285 Added Scalariform sbt plugin which formats code on each compile. Also checking in reformatted code 2011-05-18 17:25:30 +02:00
Jonas Bonér
9d73c28514 Merged wip-2.0 branch with latest master 2011-05-16 12:32:00 +02:00
Jonas Bonér
d9cc8d6cb8 Misc fixes everywhere; deployment, serialization etc. 2011-05-16 09:47:23 +02:00
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
Jonas Bonér
c7c3e17b43 Rebased from master branch 2011-04-27 01:06:08 +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
1d1d32cd7f mid-address-refactoring: all tests except remote and serialization tests passes 2011-04-20 20:43:17 +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
8c0152b7bc Merged with Viktors work with removing client managed actors. Also removed actor.id, added actor.address 2011-04-08 21:16:05 +02:00
Jonas Bonér
1ff587765c commit in the middle of address refactoring 2011-04-08 15:29:14 +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