Merge pull request #2984 from mmitche/up-timeouts
authorMatt Mitchell <mmitche@microsoft.com>
Tue, 2 Feb 2016 17:58:26 +0000 (09:58 -0800)
committerMatt Mitchell <mmitche@microsoft.com>
Tue, 2 Feb 2016 17:58:26 +0000 (09:58 -0800)
Increase timeouts for non-windows configs


Trivial merge