Code

noop merge of 2.10.x to master#116

Code

Merged

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

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

Jul 7, 2015

Commits

Commits on Jul 6, 2015

• [backport] Avoid masking real errors with NotImplemented awaiting Future[Nothing]

  Show description for f1d9667
  retronym

  committed
  f1d9667

  Copy full SHA for f1d9667

• Merge pull request #113 from retronym/backport/104

  Show description for d7914c3
  retronym

  committed
  d7914c3

  Copy full SHA for d7914c3

• Avoid compiler warning when awaiting Future[Unit]

  Show description for e1377aa
  retronym

  committed
  e1377aa

  Copy full SHA for e1377aa

• Merge pull request #115 from retronym/backport/74

  Show description for 30cc2c5
  retronym

  committed
  30cc2c5

  Copy full SHA for 30cc2c5

• Merge remote-tracking branch 'origin/2.10.x' into merge/2.10.x-to-master-20150707

  retronym

  committed
  9282ac9

  Copy full SHA for 9282ac9