tree 5f41ec75886857d2540479800e41b48106c4031a
parent 6814c723672cab3dbc20931496132a1abcdba586
parent 9b5c3110ff8d6c1ce3de24970ec991547b6783ea
author swift-ci <swift-ci@users.noreply.github.com> 1468617200 -0700
committer swift-ci <swift-ci@users.noreply.github.com> 1468617200 -0700

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

* origin/swift-3.0-branch:
  Disable the "gcd-io-race.mm" test to investigate bot hangs due to the test being deadlocked.
  [tsan] Add support for GCD IO channels on Darwin