Merge pull request #5122 from JohnChen0/timeout
authorJohn Chen <jochen@microsoft.com>
Fri, 20 May 2016 23:33:45 +0000 (16:33 -0700)
committerJohn Chen <jochen@microsoft.com>
Fri, 20 May 2016 23:33:45 +0000 (16:33 -0700)
Resolve two issues that cause pri1r2r test timeout on Ubuntu


Trivial merge