From 47d65774e312afb540d88d1ff8f4e1687a641d6f Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Sun, 1 Jan 2012 11:33:20 +0100
Subject: [PATCH] parallelExecution default false, use
 -Dakka.parallelExecution=true for warp speed.

---
 akka-docs/dev/building-akka.rst | 9 +++++++++
 project/AkkaBuild.scala         | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/akka-docs/dev/building-akka.rst b/akka-docs/dev/building-akka.rst
index d5e94107d1..495d8ba5ed 100644
--- a/akka-docs/dev/building-akka.rst
+++ b/akka-docs/dev/building-akka.rst
@@ -75,6 +75,15 @@ If compiling and testing are successful then you have everything working for the
 latest Akka development version.
 
 
+Parallel Execution
+------------------
+
+By default the tests are executed sequentially. They can be executed in parallel to reduce build times,
+if hardware can handle the increased memory and cpu usage. Add the following system property to sbt
+launch script to activate parallel execution::
+
+  -Dakka.parallelExecution=true
+
 Publish to local Ivy repository
 -------------------------------
 
diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 31abb52dac..8f6e656e46 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -25,7 +25,7 @@ object AkkaBuild extends Build {
     id = "akka",
     base = file("."),
     settings = parentSettings ++ Release.settings ++ Unidoc.settings ++ Rstdoc.settings ++ Publish.versionSettings ++ Dist.settings ++ Seq(
-      parallelExecution in GlobalScope := System.getProperty("akka.parallelExecution", "true").toBoolean,
+      parallelExecution in GlobalScope := System.getProperty("akka.parallelExecution", "false").toBoolean,
       Publish.defaultPublishTo in ThisBuild <<= crossTarget / "repository",
       Unidoc.unidocExclude := Seq(samples.id, tutorials.id),
       Dist.distExclude := Seq(actorTests.id, akkaSbtPlugin.id, docs.id)
@@ -314,7 +314,7 @@ object AkkaBuild extends Build {
       if (true || (System getProperty "java.runtime.version" startsWith "1.7")) Seq() else Seq("-optimize")), // -optimize fails with jdk7
     javacOptions  ++= Seq("-Xlint:unchecked", "-Xlint:deprecation"),
 
-    parallelExecution in Test := System.getProperty("akka.parallelExecution", "true").toBoolean,
+    parallelExecution in Test := System.getProperty("akka.parallelExecution", "false").toBoolean,
 
     // for excluding tests by name (or use system property: -Dakka.test.names.exclude=TimingSpec)
     excludeTestNames := {