Viktor Klang
a0cf41b3ef
Merge conflict resolution
2012-06-19 23:06:26 +02:00
Viktor Klang
64566e6912
Rewriting large parts of the SSL tests and adding cleanup to the code
2012-06-19 22:44:01 +02:00
Viktor Klang
f5fb24719d
Disabling SSL once again
2012-06-19 21:19:19 +02:00
Jonas Bonér
d38aa2ed9c
Added ScalaDoc about the Leaving, Exiting and Removed states
2012-06-19 20:11:54 +02:00
Björn Antonsson
6bf37ad59f
Merge branch 'wip-2218-test-conductor-barrier-timeouts'
2012-06-19 17:11:24 +02:00
Björn Antonsson
14184e99e9
Changed tests to use enterBarrier
2012-06-19 17:10:03 +02:00
Viktor Klang
5f066165ba
Commenting out Ticket1978AES128CounterRNGSecureSpec
2012-06-19 16:34:02 +02:00
Björn Antonsson
3db9f7eb41
Changes based on review
2012-06-19 16:32:51 +02:00
Viktor Klang
23a87afca6
Commenting out one of the SSL tests since I can't see how it is needed
2012-06-19 16:10:46 +02:00
Viktor Klang
45d3c7dccd
Merge branch 'master' of github.com:akka/akka
2012-06-19 15:24:10 +02:00
Viktor Klang
53d8ef601e
Revert "Sigh, the tests are flakier than a flaky flake from flakeville"
...
This reverts commit 9862afab84
2012-06-19 15:24:00 +02:00
Björn Antonsson
4a56f195fc
Merge branch 'master' into wip-2218-test-conductor-barrier-timeouts
2012-06-19 15:11:50 +02:00
Jonas Bonér
4a5bd84f84
Merge pull request #547 from akka/wip-2162-redesign-of-management-of-the-exiting-to-removed-life-cycle-jboner
...
Redesign of management of the EXITING to REMOVED life-cycle (and some more goodies)
2012-06-19 06:10:26 -07:00
Jonas Bonér
9011c310e1
Minor cleanup.
...
Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
2012-06-19 14:27:12 +02:00
Jonas Bonér
fd54a93135
Added ScalaDoc on 'def status: MemberStatus' describing the MemberStatus.Removed semantics.
...
Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
2012-06-19 14:21:56 +02:00
Jonas Bonér
4f8522dc63
Merged in the old MemberSpec with the new MemberOrderingSpec.
...
Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
2012-06-19 14:21:11 +02:00
Viktor Klang
5b8ce4cc6b
Turning on the ssl test again
2012-06-19 12:17:41 +02:00
Viktor Klang
9862afab84
Sigh, the tests are flakier than a flaky flake from flakeville
2012-06-19 12:16:10 +02:00
Viktor Klang
32562652af
remove debug statement
2012-06-19 11:09:54 +02:00
Viktor Klang
4f3f4aadba
I think I nailed it.
2012-06-19 10:36:09 +02:00
Viktor Klang
e730432cb0
Switching to 256bit for the Ticket1978AES128CounterRNGSecureSpec
2012-06-18 20:07:58 +02:00
Viktor Klang
16530fd88a
Deactivating the SSL tests for now
2012-06-18 19:58:23 +02:00
Viktor Klang
a9f258b23e
Trying to work around the fact that intercept doesn't respect remaining but invents its own default timeout
2012-06-18 19:31:36 +02:00
Viktor Klang
8eca3692c8
Switching to 30s timeout for the SSL tests + loading from classloader rather than file path
2012-06-18 18:47:35 +02:00
Jonas Bonér
c51c06aaf4
Merged with master
2012-06-18 18:39:28 +02:00
Viktor Klang
a2c15f8321
Trying to embed smarted detection for the SSL tests, is this a keeper?
2012-06-18 17:57:09 +02:00
Viktor Klang
bf32ca0c37
Minor code restructuring for the SSL tests
2012-06-18 17:18:17 +02:00
Jonas Bonér
6e60d51263
Reenabled LeaderLeavingSpec and added successful leader-handoff assertion
...
Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
2012-06-18 15:26:23 +02:00
Jonas Bonér
6b02c48be9
Added spec testing the Ordering[Address] and Ordering[Member].
...
Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
2012-06-18 15:25:46 +02:00
Jonas Bonér
49586bd01d
Change Member ordering so it sorts members by host and port with the exception that it puts all members that are in MemberStatus.EXITING last.
...
To fix LEADER leaving and allow handoff to new leader before moving old leader from EXITING -> REMOVED.
Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
2012-06-18 15:25:17 +02:00
Viktor Klang
f63409e0e7
Removing commented out code in the Ticket1978CommunicationSpec
2012-06-18 15:05:24 +02:00
Viktor Klang
6c5595acdd
Merge branch 'master' of github.com:akka/akka
2012-06-18 15:00:20 +02:00
Viktor Klang
ceb7d1515a
Switching strategy for SSL detection to try to initialize a Client SslHandler
2012-06-18 14:55:49 +02:00
viktorklang
b3f7546b62
Merge pull request #548 from akka/wip-fix-0mq-send-√
...
Switching to a more continuation based approach for sending that also so...
2012-06-18 05:33:40 -07:00
Viktor Klang
914a83b291
Fixing bug in flushMessage
2012-06-18 14:31:57 +02:00
Viktor Klang
c59f058640
Removing dead code as detected by The Doctor
2012-06-18 14:29:50 +02:00
Patrik Nordwall
67a52ea5e1
Shorter gossip interval, until we optimize join, see #2239
2012-06-18 14:10:57 +02:00
Viktor Klang
da5862ab6f
InitialiZe
2012-06-18 14:02:08 +02:00
Viktor Klang
e656ea702e
Merge branch 'master' of github.com:akka/akka
2012-06-18 13:57:53 +02:00
Viktor Klang
5a3a02a516
Unrandom to unb0rk Linux, because Linux has some issues with dev/random entropy
2012-06-18 13:57:42 +02:00
Jonas Bonér
8b6652a794
Fixed all issues from review. In particular fully separated state transformation and preparation for side-effecting processing.
...
Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
2012-06-18 13:53:49 +02:00
Jonas Bonér
c0dff0050b
Minor edit .
...
Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
2012-06-18 13:52:06 +02:00
Jonas Bonér
e362c2f488
Cleaned up LeaderLeavingSpec.
...
…and turned it off until redesign of leader leaving is implement.
Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
2012-06-18 13:51:54 +02:00
Jonas Bonér
a5fe6ea607
Fixed wrong ScalaDoc.
...
Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
2012-06-18 13:51:00 +02:00
viktorklang
ed64cdcc5c
Merge pull request #542 from szabolcsberecz/wip-2156-sbt-plugin-dist-project-dep-khernyo
...
#2156 - sbt plugin: project dependencies should be included automatically
2012-06-18 04:42:28 -07:00
Viktor Klang
f44bc9dc0c
Switching to a more continuation based approach for sending that also solves the issue when sending is not possible
2012-06-18 12:09:53 +02:00
viktorklang
74e69c4ebd
Merge pull request #539 from akka/wip-2217-create-nonpublic-class-√
...
#2217 - setting accessible = true before newInstance
2012-06-18 01:40:56 -07:00
viktorklang
8d6fed6866
Merge pull request #538 from akka/wip-replace-receive-√
...
Wip replace receive √
2012-06-18 01:38:20 -07:00
Roland Kuhn
0df105f8a1
correct ActorSystem’s error message for invalid system name, see #2246
2012-06-18 10:20:43 +03:00
Jonas Bonér
6d96d04234
Merge branch 'master' into wip-2162-redesign-of-management-of-the-exiting-to-removed-life-cycle-jboner
2012-06-16 00:18:26 +02:00
