Merge pull request #1332 from sbt/wip/disable-force-gc

Default force gc to false
sbt · May 13, 2014 · d509ff8 · d509ff8
2 parents d84f729 + 015ccf2
commit d509ff8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/main/src/main/scala/sbt/EvaluateTask.scala b/main/src/main/scala/sbt/EvaluateTask.scala
@@ -89,7 +89,7 @@ final object EvaluateTaskConfig {
 	// Returns the default force garbage collection flag,
 	// as specified by system properties.
 	private[sbt] def defaultForceGarbageCollection: Boolean =
-	  sys.props.get("sbt.task.forcegc").map(java.lang.Boolean.parseBoolean).getOrElse(true)
+	  sys.props.get("sbt.task.forcegc").map(java.lang.Boolean.parseBoolean).getOrElse(false)
 	/** Pulls in the old configuration format. */
 	def apply(old: EvaluateConfig): EvaluateTaskConfig = {
 	  object AdaptedTaskConfig extends EvaluateTaskConfig {

diff --git a/src/sphinx/Community/Changes.rst b/src/sphinx/Community/Changes.rst
@@ -2,10 +2,6 @@
 Changes
 =======
 
-0.13.5-RC1 to 0.13.5-RC2
-~~~~~~~~~~~~~~~~~~~~~~~~
-- Fixes auto plugins not detecting ``object autoImport``. (gh-1314) 
-
 0.13.2 to 0.13.5
 ~~~~~~~~~~~~~~~~
 - The Scala version for sbt and sbt plugins is now 2.10.4.  This is a compatible version bump.
@@ -18,6 +14,8 @@ Changes
 - ``testResultLogger`` is now configured.
 - sbt-server hooks for task cancellation.
 - Add ``JUnitXmlReportPlugin`` which generates junit-xml-reports for all tests.
+- Fixes auto plugins not detecting ``object autoImport``. (gh-1314) 
+- Optionally enable forced garbage collection after tasks (``-Dsbt.task.forcegc=true``).
 
 
 0.13.1 to 0.13.2