Commit graph

12466 commits

Author SHA1 Message Date
Viktor Klang
53fbf09616 Simplifying a metrics collection test 2012-09-25 00:51:10 +02:00
Viktor Klang (√)
19ad55e7d3 Merge pull request #740 from helena/wip-2546-heap-mem-metric
#2546 MetricsCollectorSpec assertion modified for heap mem max in relati...
2012-09-24 15:50:12 -07:00
Helena Edelson
2866ee3082 Merge branch 'master' into wip-2546-heap-mem-metric
Conflicts:
	akka-cluster/src/test/scala/akka/cluster/MetricsCollectorSpec.scala
2012-09-24 16:46:58 -06:00
Viktor Klang
857722aea8 Minor cleanup in MetricsCollectorSpec 2012-09-25 00:31:59 +02:00
Helena Edelson
0a2e66b9c3 #2546 MetricsCollectorSpec assertion modified for heap mem max in relation to used and committed. 2012-09-24 16:31:39 -06:00
Viktor Klang
c27d4042b0 Merge branch 'master' of github.com:akka/akka 2012-09-24 22:37:28 +02:00
Viktor Klang
35f82f8f84 Making sure that akka-docs also has the CPS plugin enabled, for the dataflow doc spec 2012-09-24 22:37:06 +02:00
Viktor Klang (√)
6cb7a8cb79 Merge pull request #732 from akka/wip-2097-√
#2097 - Adding ls-sbt for all akka projects.
2012-09-24 12:25:20 -07:00
Patrik Nordwall
7868fb3c1b Merge pull request #739 from helena/wip-939-cluster-metrics-api-helena
Cluster metrics internal API and cluster-wide transport of metrics data.
2012-09-24 12:17:58 -07:00
Viktor Klang
fb928975d5 Removing apparently superfluous resolvers 2012-09-24 21:09:40 +02:00
Helena Edelson
dbce1c8b85 Cluster metrics internal API and cluster-wide transport of metrics data.
* Create Cluster Metrics API
* Create transport of relevant metrics data
Does not include load-balancing routers.
2012-09-24 13:07:11 -06:00
Viktor Klang
84af39f0dd Fixing version string in dataflow.rst 2012-09-24 20:19:37 +02:00
Viktor Klang (√)
9a20baa831 Merge pull request #736 from akka/wip-2440-testconductor-fail-patriknw
TestConductorSpec failure, final barrier missing, see #2440
2012-09-24 07:22:10 -07:00
Viktor Klang (√)
b197fa6c8c Merge pull request #734 from akka/wip-2373-√
Wip 2373 √
2012-09-24 07:20:43 -07:00
Viktor Klang
eda711b7fd Merge branch 'wip-2373-√' of github.com:akka/akka into wip-2373-√ 2012-09-24 16:19:51 +02:00
Viktor Klang
6fc880c4dd Adding docs section in the CONTRIBUTING.md about experimental modules. 2012-09-24 16:18:52 +02:00
Patrik Nordwall
7d1a9e1d29 TestConductorSpec failure, final barrier missing, see #2440 2012-09-24 15:37:31 +02:00
Viktor Klang (√)
a51d8dbe74 Update CONTRIBUTING.md
Properly indenting CONTRIBUTING.md
2012-09-24 16:23:45 +03:00
Viktor Klang
99aeef3ee9 Adding Code Reviews section and Source style section to the CONTRIBUTING.md 2012-09-24 15:20:27 +02:00
Viktor Klang (√)
4ca684881d Merge pull request #733 from akka/wip-2536-√
#2536 - Fixing docs and making sure test artifacts are published for Akk...
2012-09-24 05:38:25 -07:00
Viktor Klang
6a5c2d418c Docs reformatting for adding the durable mailbox test fixture 2012-09-24 14:37:24 +02:00
Viktor Klang
76988511b2 Minor cleanup of ls-sbt config 2012-09-24 14:36:20 +02:00
Viktor Klang
7875cbc759 Removing weird artifact id in durable mailbox.rst 2012-09-24 14:24:19 +02:00
Viktor Klang
de433d112b Fixing version string and crossVersion string and artifact id 2012-09-24 14:03:08 +02:00
Patrik Nordwall
4c9d1760a1 Don't await the write of shutdownSignal to openChannels when shutting netty, see #2535
* The multi node tests triggered shutdown ordering issue
* Not necessary to awaitUninterruptibly for the shutdownSignal to
  openChannels
2012-09-24 13:20:05 +02:00
Viktor Klang (√)
429e8799a2 Update CONTRIBUTING.md
Adding workflow instructions for contributing to Akka
2012-09-24 13:35:16 +03:00
Viktor Klang
1f11021de1 Adding a CONTRIBUTING.md 2012-09-24 12:11:50 +02:00
Viktor Klang
956ec5990f #2536 - Fixing docs and making sure test artifacts are published for Akka Mailboxes Common 2012-09-24 12:07:22 +02:00
Viktor Klang
a44baf0f44 #2097 - Adding ls-sbt for all akka projects. 2012-09-24 11:52:02 +02:00
Roland
ca75bbc2a0 say "IO support" in docs (avoid "module") 2012-09-24 11:51:21 +02:00
Viktor Klang (√)
4e4acef959 Merge pull request #731 from akka/wip-2527-√
Removing warning about not touching instance fields in receive
2012-09-24 01:50:46 -07:00
Jonas Bonér
5cbc6d8f76 minor edits to cluster-usage doc 2012-09-23 12:55:31 +02:00
Viktor Klang
fe19318495 Removing warning about not touching instance fields in receive 2012-09-23 00:24:01 +02:00
Roland
472637f799 fix akka-docs build after sphinx run 2012-09-22 12:15:47 +02:00
Patrik Nordwall
d355f1bf29 Merge pull request #727 from akka/wip-2437-doc-cluster-test-patriknw
Describe how to write cluster test, see #2437
2012-09-22 00:22:40 -07:00
Patrik Nordwall
aa5f6154c8 Adjust paths, see #2437 2012-09-22 09:21:21 +02:00
Patrik Nordwall
d2747df451 Merge branch 'master' into wip-2437-doc-cluster-test-patriknw
Conflicts:
	project/AkkaBuild.scala
2012-09-22 09:16:05 +02:00
Björn Antonsson
2574a4bda0 Merge pull request #725 from akka/wip-2349-multi-node-and-multi-jvm-doc-ban
WIP 2349 Multi Node Testing Docs and Sample
2012-09-21 10:59:28 -07:00
Björn Antonsson
dc5b377bb1 Cleanup after merge. 2012-09-21 17:26:22 +02:00
Patrik Nordwall
4ee6dabfdc Merge pull request #729 from akka/wip-2537-doc-remote-deploy-java-patriknw
Correction of Java doc Creating Actors Remotely, see #2537
2012-09-21 08:09:36 -07:00
Patrik Nordwall
b21687dbf2 Hide Echo actor impl from docs, see #2537 2012-09-21 17:08:36 +02:00
Patrik Nordwall
5a2ebb172d Merge branch 'master' into wip-2537-doc-remote-deploy-java-patriknw
Conflicts:
	akka-docs/rst/java/code/docs/remoting/RemoteActorExample.java
2012-09-21 17:01:13 +02:00
Björn Antonsson
78597ed7c1 Merge branch 'master' into wip-2349-multi-node-and-multi-jvm-doc-ban
Conflicts:
	project/plugins.sbt
2012-09-21 17:00:34 +02:00
Patrik Nordwall
f38690de99 Minor correction, see #2437 2012-09-21 16:53:21 +02:00
Patrik Nordwall
158f32e99b Merge branch 'master' into wip-2437-doc-cluster-test-patriknw 2012-09-21 16:50:18 +02:00
Patrik Nordwall
4ff414bd3f Merge pull request #722 from akka/wip-2251-doc-cluster-fd-patriknw
Describe cluster failure detector and phi, see #2251
2012-09-21 07:45:10 -07:00
Patrik Nordwall
f6f81d1fd0 Move phi images to new dir, see #2251 2012-09-21 16:40:17 +02:00
Patrik Nordwall
28e7b8af38 Merge branch 'master' into wip-2251-doc-cluster-fd-patriknw 2012-09-21 16:39:12 +02:00
Roland
e7a10886fb Merge branch 'master' of github.com:akka/akka 2012-09-21 16:33:51 +02:00
Roland
20c7b274cb now hopefully fix it for real (no guarantees, it just works here) 2012-09-21 16:33:28 +02:00