Code

Noop merge of 2.10.x to master.#134

Code

Merged

retronym merged 8 commits intoscala:masterscala/scala-async:masterfrom

retronym:merge/2.10.x-to-master-20150730retronym/async:merge/2.10.x-to-master-20150730Copy head branch name to clipboard

Jul 30, 2015

Commits

Commits on Jul 27, 2015

• Update SBT for the warn command, now assumed by sbt-extras

  Show description for 2d6d5eb
  retronym

  committed
  2d6d5eb

  Copy full SHA for 2d6d5eb

• Merge pull request #124 from retronym/backport/sbt-bump

  Show description for ad6c3c0
  retronym

  committed
  ad6c3c0

  Copy full SHA for ad6c3c0

Commits on Jul 30, 2015

• [backport] Cleanup code generation by avoiding redundant blocks

  Show description for dc3fd62
  retronym

  committed
  dc3fd62

  Copy full SHA for dc3fd62

• [backport] Avoid dead code warnings in generated code.

  Show description for a23cfa3
  retronym

  committed
  a23cfa3

  Copy full SHA for a23cfa3

• [backport] Avoid dead code warning with async(throw T)

  Show description for 3654f22
  retronym

  committed
  3654f22

  Copy full SHA for 3654f22

• [backport] Stop test compiler before code generation

  Show description for 62bb8cf
  retronym

  committed
  62bb8cf

  Copy full SHA for 62bb8cf

• [backport] Make nsc.Global based tests work under SBT

  Show description for f9e170e
  retronym

  committed
  f9e170e

  Copy full SHA for f9e170e

• Merge commit 'f9e170e3187f83c5d00e9ea8128fe2edf2bd371c' into merge/2.10.x-to-master-20150730

  retronym

  committed
  3018bea

  Copy full SHA for 3018bea