raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10
492 commits 1 branch 31 tags 268 MiB
Commit graph

492 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roland
5193e8a849 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
Peter Veentjer
df4db16ec0 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
e3071a76c4 Merge branch 'master' of github.com:jboner/akka 2011-08-07 14:48:22 +03:00
Derek Williams
ac1d3a1d3b Merge branch 'masterfuture' 2011-08-06 16:19:55 -06:00
Peter Veentjer
c761ac2e49 ticket #992 after merge 2011-08-06 23:10:30 +03:00
Viktor Klang
b492ee7cd5 Merge branch 'master' of github.com:jboner/akka 2011-08-03 14:26:26 +02:00
Derek Williams
196c581966 Merge branch 'master' into derekjw-1054 
Conflicts:
	akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
 2011-08-02 11:21:48 -06:00
Derek Williams
a6a8e4da38 Merge branch 'master' into derekjw-1054 2011-07-28 09:58:16 -06:00
Peter Veentjer
6b9b26ecd5 ticket #889 after merge 2011-07-28 16:56:35 +03:00
Derek Williams
b9eccb75eb Merge branch 'master' into wip-derekjw 
Conflicts:
	akka-actor-tests/src/test/scala/akka/misc/SchedulerSpec.scala
	akka-actor/src/main/scala/akka/actor/ActorRef.scala
	akka-cluster/src/main/scala/akka/cluster/ClusterActorRef.scala
	akka-tutorials/akka-tutorial-second/src/main/scala/Pi.scala
	project/AkkaBuild.scala
 2011-07-26 13:05:28 -06:00
Derek Williams
ac84c70540 Merge branch 'master' into wip-derekjw 
Conflicts:
	akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
	akka-actor/src/main/scala/akka/actor/ActorRef.scala
 2011-07-26 12:50:09 -06:00
Viktor Klang
0e4208c00c Merge branch 'master' of github.com:jboner/akka 2011-07-20 12:58:59 +02:00
Peter Veentjer
da9a6a5698 Merge branch 'master' of github.com:jboner/akka 2011-07-20 11:26:23 +03:00
Peter Veentjer
1b45d088db Merge branch 'master' of github.com:jboner/akka 2011-07-20 11:20:58 +03:00
Viktor Klang
74134a72c7 Merge branch 'master' of github.com:jboner/akka 2011-07-20 10:20:54 +02:00
Roland
cd0dab7ca9 Merge branch 'ticket955' 
Conflicts:
	akka-actor-tests/src/test/scala/akka/actor/supervisor/Ticket669Spec.scala
	akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala
	akka-camel/src/test/scala/akka/camel/ConsumerScalaTest.scala
 2011-07-19 16:56:44 -04:00
Garrick Evans
d1a59b2cc3 Merge branch 'master' of github.com:jboner/akka 
Conflicts:
	akka-actor/src/main/scala/akka/actor/ActorRef.scala
 2011-07-15 14:39:18 -07:00
Derek Williams
d25046d968 Merge branch 'master' into wip-derekjw 
Conflicts:
	akka-actor-tests/src/test/scala/akka/actor/supervisor/Ticket669Spec.scala
	akka-actor/src/main/scala/akka/actor/ActorRef.scala
 2011-07-15 11:44:48 -06:00
Derek Williams
26913c5e32 Merge branch 'master' into wip-derekjw 
Conflicts:
	akka-actor-tests/src/test/scala/akka/misc/SchedulerSpec.scala
 2011-07-15 11:31:24 -06:00
Peter Veentjer
a1e6ee7eb2 Merge branch 'master' of github.com:jboner/akka 2011-07-14 20:35:52 +03:00
Viktor Klang
cde52c9376 Merge branch 'master' of github.com:jboner/akka 2011-07-14 16:03:52 +02:00
Viktor Klang
163d5deb82 Updating copyright section to Typesafe Inc. etc 2011-07-14 16:03:08 +02:00
viktorklang
de568aaa24 Merge pull request #86 from bwmcadams/master 
Documentation for MongoDB Based Durable Mailboxes
 2011-07-12 10:07:17 -07:00
Brendan W. McAdams
db6e873d43 Merge branch 'master' of https://github.com/jboner/akka 2011-07-12 11:54:27 -04:00
viktorklang
9d35671f48 Merge pull request #85 from bwmcadams/master 
Added Support For MongoDB Durable Mailboxes
 2011-07-12 01:02:05 -07:00
Brendan W. McAdams
d14a2e0056 Merge branch 'master' of https://github.com/jboner/akka 2011-07-11 20:03:44 -04:00
Brendan W. McAdams
4127062086 Merge branch 'master' of https://github.com/jboner/akka 2011-07-11 18:44:04 -04:00
Derek Williams
8d8680af7a Merge branch 'master' into wip-derekjw 
Conflicts:
	akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
	akka-actor/src/main/scala/akka/actor/Actor.scala
	akka-actor/src/main/scala/akka/actor/ActorRef.scala
	akka-actor/src/main/scala/akka/actor/TypedActor.scala
	akka-actor/src/main/scala/akka/dispatch/Future.scala
 2011-07-11 13:02:42 -06:00
Peter Veentjer
f06dd4dcf7 Merge branch 'master' of github.com:jboner/akka 2011-07-11 17:21:56 +03:00
Brendan W. McAdams
e7e86d8872 Merge branch 'master' of https://github.com/jboner/akka 2011-07-09 09:58:13 -04:00
Peter Veentjer
fda7f68879 Contains the new tests for the direct routing 2011-07-07 19:09:34 +03:00
Brendan W. McAdams
9ae1456971 Merge branch 'master' of github.com:bwmcadams/akka 2011-07-05 20:20:15 -04:00
Jonas Bonér
7fee1ddfaa Merge branch 'master' of github.com:jboner/akka 2011-07-05 16:18:25 +02:00
Martin Krasser
0d74504d88 Merge remote branch 'remotes/origin/modules-migration' 
- Move akka-sample-camel from akka-modules repo to akka repo
- Conflicts (manually resolved):
	akka-docs/modules/spring.rst (use existing)
	project/build/AkkaProject.scala (use existing)
 2011-07-04 13:31:05 +02:00
Derek Williams
8426e0d340 Merge branch 'master' into wip-derekjw 2011-06-28 12:21:44 -06:00
Derek Williams
15f29217e2 Merge branch 'master' into wip-derekjw 
Conflicts:
	project/build/AkkaProject.scala
 2011-06-23 13:31:14 -06:00
Derek Williams
d345280ef6 Merge branch 'master' into wip-derekjw 2011-06-19 14:49:50 -06:00
Derek Williams
ad0f0af940 Merge branch 'master' into wip-derekjw 2011-06-18 23:34:18 -06:00
Derek Williams
87cf04d3cd Merge branch 'master' into wip-derekjw 2011-06-17 16:46:36 -06:00
Derek Williams
954d982a03 Merging all my branches together 2011-06-17 12:41:40 -06:00
Derek Williams
b83888d01e Merge branch 'master' into promisestream 2011-06-15 14:57:24 -06:00
Derek Williams
6da6d3551b Merge branch 'master' into nio-actor 2011-06-14 12:40:16 -06:00
Derek Williams
f1e2f1b541 Merge branch 'master' into promisestream 
Conflicts:
	akka-actor/src/main/scala/akka/dispatch/Future.scala
 2011-06-14 12:27:20 -06:00
Jonas Bonér
7d6e42718d Merge branch 'master' of github.com:jboner/akka 2011-06-14 19:35:40 +02:00
Jonas Bonér
fd69c081cd Merge branch 'master' into pluggable-serializer 2011-06-14 15:00:47 +02:00
Jonas Bonér
4f34c19417 Merge branch 'master' into pluggable-serializer 2011-06-14 14:41:24 +02:00
Derek Williams
0dca1bc91d Merge branch 'master' into nio-actor 2011-06-13 22:38:02 -06:00
Derek Williams
632f779618 Merge branch 'master' into nio-actor 2011-06-13 16:58:44 -06:00
Roland
67cff2eebc Merge branch 'master' of github.com:jboner/akka 2011-06-14 00:22:56 +02:00
Roland
c0d7881a84 Merge branch 'master' of github.com:jboner/akka 
Conflicts:
	akka-actor/src/main/scala/akka/actor/Actor.scala
	akka-actor/src/main/scala/akka/actor/ActorRef.scala
	akka-actor/src/main/scala/akka/actor/TypedActor.scala
	akka-cluster/src/main/scala/akka/cluster/ClusterActorRef.scala
	akka-cluster/src/main/scala/akka/cluster/ReplicatedClusterRef.scala
	akka-durable-mailboxes/akka-mailboxes-common/src/main/scala/akka/actor/mailbox/DurableDispatcher.scala
	akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala
	akka-tutorials/akka-tutorial-second/src/main/java/akka/tutorial/java/second/Pi.java
 2011-06-14 00:19:54 +02:00