Merge 445232e12f647af92a3ee4111ff1b43e70d92fe3 into…

Authored by Hao Wu <wuhao.wise@gmail.com> on Apr 20 2017, 7:20 PM.
This commit has been deleted in the repository: it is no longer reachable from any branch, tag, or ref.
GitHub <noreply@github.com> committed R23:46139c5c56a7: Merge 445232e12f647af92a3ee4111ff1b43e70d92fe3 into… (authored by Hao Wu <wuhao.wise@gmail.com>).Apr 20 2017, 7:20 PM

Merged Changes

CommitAuthorDetailsCommitted
445232e12f64sskhandp/Hao Wu
timeout was being thrown as assertion failure... changed it back to timeout… 
Apr 20
1f5f698227fdsskhandp/Hao Wu
Wait for rotation to complete before verifying that it changed. 
Apr 20