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

110 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonas Bonér
2ba8aadb8f Merge branch 'ticket_345' 
Conflicts:
	akka-core/src/test/scala/SchedulerSpec.scala
 2010-07-26 12:27:14 +02: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
Martin Krasser
fd7843a7d4 Merge commit 'remotes/origin/master' into 320-krasserm 2010-07-15 07:47:24 +02:00
Jonas Boner
db8d34aacf Merge branch 'master' of github.com:jboner/akka 2010-07-11 12:18:49 +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
Roman Roelofsen
a453f8fab9 Merge branch 'master' into osgi 2010-06-28 12:23:14 +02:00
Roman Roelofsen
03dcd2bef9 Merge remote branch 'origin/osgi' into osgi 2010-06-28 12:22:24 +02:00
Viktor Klang
70f805bb88 FP approach always makes one happy 2010-06-27 23:54:12 +02:00
Viktor Klang
3f3a5fe67f Minor tidying 2010-06-27 23:45:49 +02:00
Viktor Klang
fa318962a4 Atmosphere bugfix 2010-06-25 15:54:41 +02:00
Jonas Bonér
0871bf3f32 Merge branch 'master' of git@github.com:jboner/akka 2010-06-24 16:19:08 +02:00
Roman Roelofsen
105b8ee259 Merge branch 'master' into osgi 2010-06-24 15:49:52 +02:00
Martin Krasser
a8cef9c5a4 Merge branch 'master' of github.com:jboner/akka 2010-06-24 07:13:55 +02:00
Jonas Bonér
9eddbc90ef Merge branch 'master' of git@github.com:jboner/akka 2010-06-23 10:59:08 +02:00
Viktor Klang
baa3b49857 Added akka.conf values as defaults and removed lift dependency 2010-06-22 22:52:05 +02:00
Jonas Bonér
ebd7120ab2 Merge branch 'master' of git@github.com:jboner/akka 2010-06-22 07:23:05 +02:00
Johan Rask
e2e0b4be8a Merge branch 'master' of github.com:jboner/akka 2010-06-21 20:58:40 +02:00
Jonas Bonér
3457e64f22 Merge branch 'master' of git@github.com:jboner/akka 2010-06-21 20:26:35 +02:00
Heiko Seeberger
54ecb0bb11 Merge branch 'master' into osgi 
Conflicts:
	project/build/AkkaProject.scala
 2010-06-21 16:32:25 +02:00
Johan Rask
2436780e22 Merge branch 'master' of github.com:jboner/akka 2010-06-21 13:25:10 +02:00
Heiko Seeberger
d584e3672b Merge branch '281-hseeberger' 2010-06-21 13:08:31 +02:00
Heiko Seeberger
254489ae7b closes #281: Made all subprojects test after breaking changes introduced by removing the type parameter from ActorRef.!!. 2010-06-21 13:08:10 +02:00
Heiko Seeberger
5328f6a6f0 re #281: Made all subprojects compile after breaking changes introduced by removing the type parameter from ActorRef.!!; test-compile still missing! 2010-06-21 12:47:23 +02:00
Heiko Seeberger
47e4aa1ca1 Merge branch 'master' into 281-hseeberger 
Conflicts:
	akka-core/src/test/scala/InMemoryActorSpec.scala
	akka-core/src/test/scala/StmSpec.scala
 2010-06-21 09:31:02 +02:00
Heiko Seeberger
f02c38d338 Merge branch 'master' into 281-hseeberger 
Conflicts:
	akka-core/src/main/scala/remote/RemoteServer.scala
 2010-06-19 15:54:51 +02:00