tree 6bb25537586380b1e52bd02c424f091c4d538376
parent 2f471c8f7b911aedf69d1af07554355ce6d3c370
parent 5351f5c77a0295301f1c7b182ffb0124ddfedfd3
author swift-ci <swift-ci@users.noreply.github.com> 1486486099 -0800
committer swift-ci <swift-ci@users.noreply.github.com> 1486486099 -0800

Merge remote-tracking branch 'origin/swift-4.0-branch' into stable

* origin/swift-4.0-branch:
  Revert "Modules: Use a PCMCache to manage memory buffers"
  Revert "[Modules] Fallback to building the module if a timeout occurs"