Roman Roelofsen
|
82278ae9bb
|
Merge remote branch 'origin/osgi' into osgi
|
2010-06-07 16:28:45 +02:00 |
|
Roman Roelofsen
|
97a70ab384
|
Merge branch 'master' into osgi
Conflicts:
project/plugins/Plugins.scala
|
2010-06-07 16:02:02 +02:00 |
|
Andreas Kollegger
|
fc082914ad
|
merged with master; changed renaming of artifacts to use override def artifactID
|
2010-06-06 15:08:01 -04:00 |
|
Martin Krasser
|
bfd521858c
|
Merge remote branch 'remotes/origin/master' into 224-krasserm
|
2010-06-06 08:57:40 +02:00 |
|
Martin Krasser
|
7a6304f52d
|
Dropped service package and moved contained classes one level up.
|
2010-06-03 13:06:27 +02:00 |
|
Martin Krasser
|
71eb77332f
|
Merge commit 'remotes/origin/master' into 224-krasserm
|
2010-06-02 10:47:38 +02:00 |
|
Jonas Bonér
|
0386e4277e
|
Merge branch 'master' of git@github.com:jboner/akka
|
2010-06-01 20:57:26 +02:00 |
|
Jonas Bonér
|
e09050d90a
|
Removed trailing whitespace
|
2010-06-01 18:41:39 +02:00 |
|
Viktor Klang
|
fd45a5af1c
|
Upgraded Atmosphere to 0.6-SNAPSHOT
|
2010-05-30 21:40:20 +02:00 |
|
Jonas Bonér
|
07f82426b3
|
Merge branch 'master' of git@github.com:jboner/akka
Conflicts:
config/akka-reference.conf
|
2010-05-30 12:52:33 +02:00 |
|
Viktor Klang
|
9460dfbc09
|
Merge branch 'master' of github.com:jboner/akka into wip-akka-rest-fix
|
2010-05-29 14:39:30 +02:00 |
|
Heiko Seeberger
|
c2fd680f79
|
Merge branch '247-hseeberger'
|
2010-05-29 10:56:19 +02:00 |
|
Heiko Seeberger
|
e72e660f30
|
Merge branch 'master' into 247-hseeberger
|
2010-05-29 06:59:32 +02:00 |
|
Jonas Bonér
|
e817aa9f32
|
Merge branch 'master' of git@github.com:jboner/akka
|
2010-05-29 00:04:07 +02:00 |
|
Jonas Bonér
|
90e0eb9748
|
Fixed issue with CommitBarrier and its registered callbacks + Added compensating 'barrier.decParties' to each 'barrier.incParties'
|
2010-05-28 23:50:08 +02:00 |
|
Viktor Klang
|
5b34bd318e
|
Looks promising!
|
2010-05-28 23:13:37 +02:00 |
|
Viktor Klang
|
3188541373
|
Merge branch 'master' of github.com:jboner/akka into wip-akka-rest-fix
|
2010-05-28 21:49:38 +02:00 |
|
Viktor Klang
|
e6ec4a714b
|
Merge branch 'master' of github.com:jboner/akka into wip-akka-rest-fix
|
2010-05-28 19:27:29 +02:00 |
|
Jonas Bonér
|
cbed93805c
|
Merge branch 'master' of git@github.com:jboner/akka
|
2010-05-28 11:00:39 +02:00 |
|
Jonas Bonér
|
6f175cbe73
|
Fixed issue with sender reference in Active Objects
|
2010-05-28 10:58:32 +02:00 |
|
Viktor Klang
|
96bb8e381e
|
Elaborated on classloader handling
|
2010-05-26 23:00:31 +02:00 |
|
Viktor Klang
|
ef8f11f8a6
|
Merge branch 'master' of github.com:jboner/akka
|
2010-05-26 21:47:25 +02:00 |
|
Viktor Klang
|
f0e2fa1327
|
Initial attempt at fixing akka rest
|
2010-05-25 21:53:49 +02:00 |
|
Roman Roelofsen
|
beb530776a
|
Merge branch 'master' into osgi
|
2010-05-25 15:43:46 +02:00 |
|
Jonas Bonér
|
0f783d9594
|
Merge branch 'master' of git@github.com:jboner/akka
|
2010-05-23 16:13:52 +02:00 |
|
Viktor Klang
|
fa9267925f
|
Merged with origin/master
|
2010-05-22 16:19:39 +02:00 |
|
Jonas Bonér
|
cbb0747dac
|
Removed trailing whitespace
|
2010-05-21 20:08:49 +02:00 |
|
Jonas Bonér
|
7ae48c5ac1
|
Merge branch 'scala_2.8.RC2' into rc2
|
2010-05-21 16:58:04 +02:00 |
|
Jonas Bonér
|
b52115897e
|
Add the possibility to start Akka kernel or use Akka as dependency JAR *without* setting AKKA_HOME or have an akka.conf defined somewhere. Also moved JGroupsClusterActor into akka-core and removed akka-cluster module
|
2010-05-21 14:50:56 +02:00 |
|
Jonas Bonér
|
09b4471d47
|
Merge branch 'master' of git@github.com:jboner/akka
|
2010-05-18 11:22:00 +02:00 |
|
Jonas Bonér
|
b42af93848
|
Merge branch 'master' of git@github.com:jboner/akka
|
2010-05-18 11:21:41 +02:00 |
|
Jonas Bonér
|
812dcdd2a3
|
Merge branch 'master' of git@github.com:jboner/akka
|
2010-05-18 10:49:37 +02:00 |
|
Viktor Klang
|
fe85ab6d64
|
Added Receive type
|
2010-05-16 23:45:36 +02:00 |
|
Jonas Bonér
|
8e426ed150
|
Merge branch 'master' of git@github.com:jboner/akka
|
2010-05-16 20:15:51 +02:00 |
|
Jonas Bonér
|
f2ebf5f8d1
|
Merged with master and fixed last issues
|
2010-05-16 20:15:08 +02:00 |
|
Jonas Bonér
|
5f1090ba32
|
Rewritten "home" address management and protocol, all test pass except 2
|
2010-05-16 10:59:06 +02:00 |
|
Viktor Klang
|
85847ada32
|
Switched newActor for actorOf
|
2010-05-08 19:01:12 +02:00 |
|
Jonas Bonér
|
3218e71b55
|
Merge branch 'ActorRefSerialization'
|
2010-05-07 11:45:04 +02:00 |
|
Jonas Bonér
|
07eb4dcf98
|
Merge branch 'master' of git@github.com:jboner/akka
|
2010-05-07 11:22:18 +02:00 |
|
Peter Vlugter
|
37cd573241
|
Merge branch 'master' into multiverse-0.5
|
2010-05-06 21:28:22 +12:00 |
|
Jonas Bonér
|
e26632c38d
|
Merge branch 'master' into ActorRefSerialization
Conflicts:
akka-core/src/main/scala/actor/Actor.scala
akka-core/src/main/scala/remote/RemoteClient.scala
|
2010-05-06 08:16:27 +02:00 |
|
Jonas Bonér
|
bffa1da082
|
Renamed ActorID to ActorRef
|
2010-05-06 08:13:12 +02:00 |
|
Jonas Bonér
|
81d455681f
|
Merged with master
|
2010-05-05 13:26:31 +02:00 |
|
Jonas Bonér
|
a2a8b31036
|
Merge branch 'master' into actor-handle
|
2010-05-04 10:41:21 +02:00 |
|
Jonas Bonér
|
55df71dad8
|
Merge branch 'master' into actor-handle
|
2010-05-03 19:25:04 +02:00 |
|
Viktor Klang
|
7d909bcfbb
|
Merge branch 'master' of git@github.com:jboner/akka into wip_restructure
|
2010-05-02 18:05:58 +02:00 |
|
Viktor Klang
|
68e8a0c69a
|
Merge branch 'master' of git@github.com:jboner/akka into wip_restructure
|
2010-05-01 11:47:33 +02:00 |
|
Viktor Klang
|
fd3d728fc0
|
Moved Grizzly logic to Kernel and renamed it to EmbeddedAppServer
|
2010-04-29 17:42:06 +02:00 |
|
Viktor Klang
|
271a8297e4
|
Consolidated akka-security, akka-rest, akka-comet and akka-servlet into akka-http
|
2010-04-29 11:03:25 +02:00 |
|
Jonas Boner
|
186f3a087c
|
init project setup
|
2009-02-16 13:53:10 +01:00 |
|