Commit graph

7175 commits

Author SHA1 Message Date
Vasil Remeniuk
54bed05e58 more logging 2011-08-14 11:20:38 +03:00
Jonas Bonér
d52d70540c Merge branch 'master' of github.com:jboner/akka 2011-08-10 07:52:05 +02:00
Jonas Bonér
3d77356005 Added policy about commit messages to the Developer Guidelines documentation 2011-08-10 07:51:52 +02:00
Roland
deb7497038 Merge channel-cleanup into remote branch 'origin/master'
Conflicts:
	akka-actor/src/main/scala/akka/dispatch/Future.scala
2011-08-09 22:05:29 +02:00
Viktor Klang
5eb15409e6 Adding DeployId and LocalOnly to Props 2011-08-09 19:31:51 +02:00
Peter Veentjer
6a49efd966 ticket 989 #Allow specifying preferred-nodes of other type than node:<name>/
currently the task has been downscoped to only allow node:name since we need to rethink this part. Metadata is going to make it /
it possible to deal with way more nodes
2011-08-09 13:33:10 +03:00
Peter Veentjer
eae045ff45 ticket 989 #Allow specifying preferred-nodes of other type than node:<name>/
currently the task has been downscoped to only allow node:name since we need to rethink this part. Metadata is going to make it /
it possible to deal with way more nodes
2011-08-09 13:22:05 +03:00
Peter Veentjer
f1bc34cad7 ticket 989 #Allow specifying preferred-nodes of other type than node:<name>/
currently the task has been downscoped to only allow node:name since we need to rethink this part. Metadata is going to make it /
it possible to deal with way more nodes
2011-08-09 13:19:59 +03:00
Peter Veentjer
c8e938a44c ticket #992: misc fixes for transaction log, processed review comments 2011-08-08 20:57:01 +03:00
Peter Veentjer
403f425283 Merge branch 'wip-992' 2011-08-08 20:41:55 +03:00
Peter Veentjer
bd049718be ticket #992: misc fixes for transaction log, processed review comments 2011-08-08 20:40:18 +03:00
Peter Veentjer
65f0d706a9 Merge branch 'master' of github.com:jboner/akka 2011-08-08 18:54:45 +03:00
Peter Veentjer
74b425fdc7 Fix of failing ClusterActorRefCleanupMultiJvmSpec: also removed some debugging code 2011-08-08 18:45:16 +03:00
Peter Veentjer
e3107715c1 Fix of failing ClusterActorRefCleanupMultiJvmSpec 2011-08-08 18:43:30 +03:00
Viktor Klang
e3bfd2f31a Removing the shutdownHook from the Actor object since we are no longer using Configgy and hence no risk of leaks thereof 2011-08-08 16:53:54 +02:00
Viktor Klang
5c4488730f Fixing FutureTimeoutException so that it has a String constructor so it's deserializable in remoting 2011-08-08 15:38:22 +02:00
Viktor Klang
49a61e2c98 Merge branch 'master' of github.com:jboner/akka 2011-08-08 08:39:34 +02:00
Viktor Klang
b8af8df41f Fixing ClusterSpec 2011-08-08 08:39:22 +02:00
Peter Veentjer
e433eda2c2 fix for a failing test:who changes the compression to none but didn't fix the testsgit add -A..you badgit add -A 2011-08-08 09:11:39 +03:00
Peter Veentjer
560701ab20 Merge branch 'master' of github.com:jboner/akka 2011-08-07 20:33:35 +03:00
Viktor Klang
4cd4917f9f Turning remote compression off by default, closing ticket #1083 2011-08-07 19:23:25 +02:00
Peter Veentjer
8a9e13e0ff ticket 934: fixed review comments 2011-08-07 16:15:04 +03:00
Peter Veentjer
06fe2d590e Merge branch 'master' of github.com:jboner/akka 2011-08-07 14:48:22 +03:00
Peter Veentjer
a5ca2bad15 ticket #958, resolved review comments 2011-08-07 14:47:45 +03:00
Derek Williams
363c196783 Merge branch 'masterfuture' 2011-08-06 16:19:55 -06:00
Derek Williams
a17b75fc09 Add check for jdk7 to disable -optimize 2011-08-06 15:00:15 -06:00
Derek Williams
0ae7a72f3a Future: Reschedule onTimeout/orElse if not yet expired 2011-08-06 14:10:36 -06:00
Peter Veentjer
32df67cb60 ticket #992 after merge 2011-08-06 23:10:30 +03:00
Peter Veentjer
aaec3aef77 ticket #992 2011-08-06 23:08:01 +03:00
Derek Williams
bc1f7565b7 Fixed race in Future.await, and minor changes to Future.result and Future.exception 2011-08-06 13:32:03 -06:00
Viktor Klang
8a1d31691c Removing deprecated methods from Future and removing one of the bad guys _as_ 2011-08-06 20:44:49 +02:00
Viktor Klang
811e14e081 Fixing await so that it respects infinite timeouts 2011-08-06 20:05:43 +02:00
Viktor Klang
9fb91e92c9 Removing awaitBlocking from Future since Futures cannot be completed after timed out, also cleaning up a lot of code to use pattern matching instead of if/else while simplifying and avoiding allocations 2011-08-06 18:49:50 +02:00
Viktor Klang
458724de34 Reimplementing DefaultCompletableFuture to be as non-blocking internally as possible 2011-08-06 14:19:42 +02:00
Derek Williams
b1c64652ce IO: add method to retry current message 2011-08-05 20:02:31 -06:00
Derek Williams
d46e5068ab Merge branch 'master' of github.com:jboner/akka 2011-08-05 08:55:43 -06:00
Derek Williams
c6bdd33d9e Future: make callback stack usable outside of DefaultPromise, make Future.flow use callback stack, hide java api from Scala 2011-08-05 08:55:36 -06:00
Viktor Klang
0f640fb4f9 Merge branch 'master' of github.com:jboner/akka 2011-08-05 14:53:39 +02:00
Viktor Klang
bb33a11ffd Adding parens to postStop in FSM, closing ticket #1079 2011-08-05 14:53:24 +02:00
Peter Vlugter
0057acdd81 Some more quietening of tests 2011-08-05 18:41:54 +12:00
Peter Vlugter
562ebd9490 Quieten the stm test output 2011-08-05 18:41:54 +12:00
Peter Vlugter
d5c0237b2f Disable parallel execution in global scope
For avoiding tests from different projects, like cluster and
zookeeper mailbox, to run in parallel
2011-08-05 18:41:54 +12:00
Peter Vlugter
b2bfe9a944 Some quietening of camel test output 2011-08-05 18:41:53 +12:00
Peter Veentjer
bb3a4d7000 Merge branch 'master' of github.com:jboner/akka 2011-08-05 05:56:32 +03:00
Peter Veentjer
b66ebdcc72 ticket #1032.. more cleanup 2011-08-05 05:56:15 +03:00
Peter Vlugter
b41778fbc4 Remove heap size option for multi-jvm 2011-08-04 17:22:34 +12:00
Peter Vlugter
ea369a4b65 Quieten the multi-jvm tests 2011-08-04 16:55:27 +12:00
Peter Veentjer
6a476b6e69 Merge branch 'wip-1032' 2011-08-04 07:23:16 +03:00
Peter Veentjer
d67fe8befe ticket #1032 2011-08-04 07:22:16 +03:00
Roland
2aa86ed37a make tryTell nice from Scala AND Java
Thanks, Derek Williams, for the good suggestion!
2011-08-03 23:08:38 +02:00