Commit graph

20524 commits

Author SHA1 Message Date
Jonas Bonér
ce064cc4c1 Merge branch 'master' of git@github.com:jboner/akka
Conflicts:
	config/akka-reference.conf
2010-05-30 12:52:33 +02:00
Jonas Bonér
baed657e34 Merge branch 'master' of git@github.com:jboner/akka
Conflicts:
	config/akka-reference.conf
2010-05-30 12:52:33 +02:00
Jonas Bonér
fb44990cb7 Fixed bug in STM and Persistence integration: added trait Abortable and added abort methods to all Persistent datastructures and removed redundant errornous atomic block 2010-05-30 12:51:24 +02:00
Jonas Bonér
4b03a9904c Fixed bug in STM and Persistence integration: added trait Abortable and added abort methods to all Persistent datastructures and removed redundant errornous atomic block 2010-05-30 12:51:24 +02:00
Martin Krasser
2d2bdda330 Upgrade to Camel 2.3.0 2010-05-30 08:22:23 +02:00
Martin Krasser
bd161626ae Upgrade to Camel 2.3.0 2010-05-30 08:22:23 +02:00
Viktor Klang
2dd2118179 Prepare for master merge 2010-05-29 15:40:52 +02:00
Viktor Klang
52f22dff2c Prepare for master merge 2010-05-29 15:40:52 +02:00
Viktor Klang
b8fd1d1c31 Ported akka-sample-secure 2010-05-29 15:24:06 +02:00
Viktor Klang
1eb7c1439f Ported akka-sample-secure 2010-05-29 15:24:06 +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
Viktor Klang
c660a9c469 Merge branch 'master' of github.com:jboner/akka into wip-akka-rest-fix 2010-05-29 14:39:30 +02:00
Viktor Klang
96d24d2ac5 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
f8b8bc7cd7 Merge branch '247-hseeberger' 2010-05-29 10:56:19 +02:00
Heiko Seeberger
d02dd49b76 Merge branch '247-hseeberger' 2010-05-29 10:56:19 +02:00
Heiko Seeberger
d1d8773f04 closes #247: Added all missing module configurations. 2010-05-29 07:28:42 +02:00
Heiko Seeberger
ce79442da8 closes #247: Added all missing module configurations. 2010-05-29 07:28:42 +02:00
Heiko Seeberger
e72e660f30 Merge branch 'master' into 247-hseeberger 2010-05-29 06:59:32 +02:00
Heiko Seeberger
c21e2d1484 Merge branch 'master' into 247-hseeberger 2010-05-29 06:59:32 +02:00
Heiko Seeberger
9075937562 Merge branch 'master' into 247-hseeberger 2010-05-29 06:59:32 +02:00
Jonas Bonér
1c37f0cddd Upgraded to Protobuf 2.3.0 2010-05-29 00:53:52 +02:00
Jonas Bonér
22630c5329 Upgraded to Protobuf 2.3.0 2010-05-29 00:53:52 +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
47e65346af Merge branch 'master' of git@github.com:jboner/akka 2010-05-29 00:04:07 +02:00
Jonas Bonér
3e314f9bc4 Merge branch 'master' of git@github.com:jboner/akka 2010-05-29 00:04:07 +02:00
Jonas Bonér
a891ddd3c0 Upgraded Configgy to one build for Scala 2.8 RC3 2010-05-29 00:02:36 +02:00
Jonas Bonér
a15dd30ff2 Upgraded Configgy to one build for Scala 2.8 RC3 2010-05-29 00:02:36 +02:00
Viktor Klang
2a060c9fa3 Ported samples rest scala to the new akka-http 2010-05-29 00:01:41 +02:00
Viktor Klang
d7282059b0 Ported samples rest scala to the new akka-http 2010-05-29 00:01:41 +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
Jonas Bonér
c22e564b74 Fixed issue with CommitBarrier and its registered callbacks + Added compensating 'barrier.decParties' to each 'barrier.incParties' 2010-05-28 23:50:08 +02:00
Jonas Bonér
1dd8740549 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
64f4b36b74 Looks promising! 2010-05-28 23:13:37 +02:00
Viktor Klang
5f405fb483 Looks promising! 2010-05-28 23:13:37 +02:00
Viktor Klang
d587d1a5fe Fixing sbt run (exclude slf4j 1.5.11) 2010-05-28 22:05:44 +02:00
Viktor Klang
8230e2c546 Fixing sbt run (exclude slf4j 1.5.11) 2010-05-28 22:05:44 +02:00
Viktor Klang
b94f584fcf ClassLoader issue 2010-05-28 22:05:17 +02:00
Viktor Klang
c7000ce5ca ClassLoader issue 2010-05-28 22:05:17 +02:00
Martin Krasser
caa60202c6 no need to start supervised actors 2010-05-28 21:50:44 +02:00
Martin Krasser
a5125ee6f4 no need to start supervised actors 2010-05-28 21:50:44 +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
f1cc27a5ca Merge branch 'master' of github.com:jboner/akka into wip-akka-rest-fix 2010-05-28 21:49:38 +02:00
Viktor Klang
2cf60ceae6 Merge branch 'master' of github.com:jboner/akka into wip-akka-rest-fix 2010-05-28 21:49:38 +02:00
Debasish Ghosh
78e69f016b checked in wrong jar: now pushing the correct one for sjson 2010-05-29 00:28:14 +05:30
Debasish Ghosh
3adcb6172f checked in wrong jar: now pushing the correct one for sjson 2010-05-29 00:28:14 +05:30
Heiko Seeberger
b5f4cfae25 re #247: Added module configuration for akka-persistence-cassandra. Attention: Necessary to delete .ivy2 directory! 2010-05-28 20:52:09 +02:00
Heiko Seeberger
d62a88d3fb re #247: Added module configuration for akka-persistence-cassandra. Attention: Necessary to delete .ivy2 directory! 2010-05-28 20:52:09 +02:00
Heiko Seeberger
f4298eb5c0 re #247: Removed all vals for repositories except for embeddedRepo. Introduced module configurations necessary for akka-core; other modules still missing. 2010-05-28 20:24:00 +02:00