Merge "change odl password for moon"
authorchenshuai@huawei.com <chenshuai@huawei.com>
Tue, 30 Aug 2016 06:15:54 +0000 (06:15 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 30 Aug 2016 06:15:54 +0000 (06:15 +0000)

Trivial merge