Merge "[multisite] stop the timer of colorado"
authormeimei <meimei@huawei.com>
Sat, 27 Aug 2016 02:29:51 +0000 (02:29 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Sat, 27 Aug 2016 02:29:52 +0000 (02:29 +0000)

Trivial merge