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

130 commits

This branch
This branch
All branches
Author SHA1 Message Date
Martin Krasser
4e3f260bea Merge branch 'master' of github.com:jboner/akka 2010-08-14 08:14:32 +02:00
Viktor Klang
fb99a87c25 Fix Atmosphere integration for the new dispatchers 2010-08-13 15:31:17 +02:00
Viktor Klang
2f75d8b817 Merge branch 'master' of github.com:jboner/akka 2010-08-13 13:13:33 +02:00
Viktor Klang
ef16b6c73a Adding first support for config dispatchers 2010-08-12 16:41:54 +02:00
momania
e7157a10a3 Merge branch 'rpc_amqp' 2010-08-12 16:25:20 +02:00
momania
c0d274f9ee Merge branch 'master' of git-proxy:jboner/akka into rpc_amqp 2010-08-12 16:19:25 +02:00
momania
dfcc31ef7e Merge branch 'master' of git-proxy:jboner/akka into rpc_amqp 2010-08-11 15:30:01 +02:00
momania
6c5e21055e Merge branch 'master' of git-proxy:jboner/akka into rpc_amqp 
Conflicts:
	akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/AMQP.scala
 2010-08-11 09:32:52 +02:00
Viktor Klang
9236796072 Merge branch 'master' into ticket337 2010-08-06 16:05:27 +02:00
momania
10a1747032 Merge branch 'master' of git-proxy:jboner/akka 2010-08-06 11:45:16 +02:00
Viktor Klang
dccd0506ad Merge branch 'ticket352' 2010-08-03 11:41:02 +02:00
Viktor Klang
3cf2dc075d Merge with master 2010-08-03 11:40:25 +02:00
momania
c9ad22741a Merge branch 'master' of git-proxy:jboner/akka 
Conflicts:
	akka-amqp/src/test/scala/AMQPConnectionRecoveryTest.scala
	akka-amqp/src/test/scala/AMQPConsumerChannelRecoveryTest.scala
	akka-amqp/src/test/scala/AMQPConsumerConnectionRecoveryTest.scala
	akka-amqp/src/test/scala/AMQPConsumerManualAcknowledgeTest.scala
	akka-amqp/src/test/scala/AMQPConsumerMessageTest.scala
	akka-amqp/src/test/scala/AMQPProducerChannelRecoveryTest.scala
	akka-amqp/src/test/scala/AMQPProducerConnectionRecoveryTest.scala
	akka-amqp/src/test/scala/AMQPProducerMessageTest.scala
	akka-amqp/src/test/scala/AMQPRpcClientServerTest.scala
 2010-08-03 09:57:15 +02:00
Jonas Bonér
da92f4f36d Merge branch 'wip-typed-actor-jboner' into master 
Conflicts:
	akka-core/src/test/scala/ActiveObjectContextSpec.scala
	akka-core/src/test/scala/ActiveObjectGuiceConfiguratorSpec.scala
	akka-core/src/test/scala/ActorObjectUtilFunctionsSpec.scala
	akka-core/src/test/scala/NestedTransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/NestedTransactionalTypedActorSpec.scala
	akka-core/src/test/scala/RemoteTransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/RemoteTransactionalTypedActorSpec.scala
	akka-core/src/test/scala/RestartNestedTransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/RestartNestedTransactionalTypedActorSpec.scala
	akka-core/src/test/scala/RestartTransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/RestartTransactionalTypedActorSpec.scala
	akka-core/src/test/scala/TransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/TransactionalTypedActorSpec.scala
	akka-core/src/test/scala/TypedActorContextSpec.scala
	akka-core/src/test/scala/TypedActorGuiceConfiguratorSpec.scala
	akka-core/src/test/scala/TypedActorUtilFunctionsSpec.scala
	akka-core/src/test/scala/actor/ActiveObjectContextSpec.scala
	akka-core/src/test/scala/actor/ActiveObjectGuiceConfiguratorSpec.scala
	akka-core/src/test/scala/actor/ActiveObjectLifecycleSpec.scala
	akka-core/src/test/scala/actor/ActorObjectUtilFunctionsSpec.scala
	akka-core/src/test/scala/actor/NestedTransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/actor/RestartNestedTransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/actor/RestartTransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/actor/TransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/remote/RemoteTransactionalActiveObjectSpec.scala
 2010-07-28 20:21:59 +02:00
Jonas Bonér
f91d39fa8a merged with upstream 2010-07-28 19:22:33 +02:00
Jonas Bonér
2ba8aadb8f Merge branch 'ticket_345' 
Conflicts:
	akka-core/src/test/scala/SchedulerSpec.scala
 2010-07-26 12:27:14 +02:00
Hiram Chirino
e6fda2cd00 Merge branch 'master' of git://github.com/jboner/akka 2010-07-23 19:04:26 -04:00
Hiram Chirino
dd546a065f Merge branch 'master' of git://github.com/jboner/akka 2010-07-23 14:08:42 -04:00
Jonas Bonér
ac45da4096 Merge branch 'master' of git@github.com:jboner/akka 2010-07-23 19:29:06 +02:00
momania
a5e49a567c Merge branch 'master' of git-proxy:jboner/akka 
Conflicts:
	project/build/AkkaProject.scala
 2010-07-22 18:25:22 +02:00
Martin Krasser
85e39377f7 Merge branch 'master' of github.com:jboner/akka 2010-07-21 20:10:02 +02:00
Heiko Seeberger
28ecd329d2 Merge branch 'master' of github.com:jboner/akka 2010-07-21 11:25:00 +02:00
Martin Krasser
059682eb77 Merge branch 'master' of github.com:jboner/akka 2010-07-21 08:38:18 +02:00
Heiko Seeberger
95cd278fca Merge branch '31-hseeberger' 2010-07-21 07:50:38 +02:00
Heiko Seeberger
f3511df9a5 Merge branch 'master' into osgi 
Conflicts:
	project/build/AkkaProject.scala
	project/plugins/Plugins.scala
 2010-07-20 11:26:34 +02:00
Heiko Seeberger
17ab34b68e Merge branch 'master' into osgi 
Conflicts:
	project/build/AkkaProject.scala
	project/plugins/Plugins.scala
 2010-07-19 18:05:47 +02:00
Martin Krasser
db6c02896a Merge branch 'master' of github.com:jboner/akka 2010-07-18 13:25:34 +02:00
Jonas Bonér
6e2495536d Merge branch 'master' of git@github.com:jboner/akka 
Conflicts:
	config/akka-reference.conf
 2010-07-18 07:30:19 +02:00
Martin Krasser
238a6bd121 Merge commit 'remotes/origin/master' into 320-krasserm, resolve conflicts and compile errors. 2010-07-17 07:04:10 +02:00
Viktor Klang
34dc4e2522 Adding support for maxInactiveActivity 2010-07-16 01:32:52 +02:00
Viktor Klang
832f7c7fd0 Merge remote branch 'origin/master' into wip-ssl-actors 2010-07-15 21:36:59 +02:00
Martin Krasser
fd7843a7d4 Merge commit 'remotes/origin/master' into 320-krasserm 2010-07-15 07:47:24 +02:00
Viktor Klang
bc40f56ee5 Merge branch 'master' into wip_141_SSL_enable_remote_actors 2010-07-14 22:38:20 +02:00
Jonas Boner
db8d34aacf Merge branch 'master' of github.com:jboner/akka 2010-07-11 12:18:49 +02:00
Viktor Klang
1602325738 Merge branch 'master' of github.com:jboner/akka into wip_141_SSL_enable_remote_actors 2010-07-07 22:24:47 +02:00
Martin Krasser
7f7c58b1d7 Resolved conflicts and compile errors after merging in master 2010-07-04 09:21:21 +02:00
Heiko Seeberger
e2818eeb39 Merge branch 'master' of github.com:jboner/akka 2010-07-02 22:56:25 +02:00
Heiko Seeberger
56b5675594 Merge branch '290-hseeberger' 2010-07-02 22:49:32 +02:00
Heiko Seeberger
4522f18eff re #290: Added parens to no-parameter methods returning Unit in all subprojects. 2010-07-02 22:37:26 +02:00
Jonas Bonér
24e30956df Merge branch 'master' of git@github.com:jboner/akka 2010-07-02 14:57:05 +02:00
momania
5e40f2fc1f Merge branch 'master' of http://github.com/jboner/akka 2010-07-02 14:10:19 +02:00
Jonas Bonér
b8ab69a951 Merge branch 'master' of git@github.com:jboner/akka 2010-07-02 13:11:54 +02:00
momania
678254fa8f Merge branch 'master' of http://github.com/jboner/akka 
Conflicts:
	akka-amqp/src/main/scala/AMQP.scala
 2010-07-02 12:49:57 +02:00
Jonas Bonér
f9c3f7b42b Changed Akka to use IllegalActorStateException instead of IllegalStateException 2010-07-02 11:39:25 +02:00
Jonas Bonér
d70ad2a867 Merge commit '02b816b893' 2010-07-01 23:58:01 +02:00
Jonas Bonér
70bbb9c5c1 Merge branch 'master' of git@github.com:jboner/akka 2010-07-01 23:27:04 +02:00
Jonas Bonér
e69bd6ec6d Merge branch 'master' of git@github.com:jboner/akka 2010-07-01 17:26:58 +02:00
Jonas Bonér
3f3ba3b97d Merge commit '38e8bea3fe' 
Conflicts:
	akka-core/src/main/scala/actor/ActorRef.scala
	akka-core/src/test/java/se/scalablesolutions/akka/actor/ActiveObjectFailer.java
	akka-core/src/test/scala/NestedTransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/RemoteSupervisorSpec.scala
	akka-core/src/test/scala/RemoteTransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/SupervisorSpec.scala
	akka-core/src/test/scala/TransactionalActiveObjectSpec.scala
 2010-07-01 17:21:17 +02:00
Jonas Bonér
4ce8ac09a4 Removed trailing whitespace 2010-06-30 16:26:15 +02:00
Jonas Bonér
fc97b18954 Converted TAB to SPACE 2010-06-30 16:20:20 +02:00