Merge "use new options instead of deprecated options for glance" into stable/brahmaputra
authorshuai chen <chenshuai@huawei.com>
Tue, 12 Jan 2016 15:24:45 +0000 (15:24 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 12 Jan 2016 15:24:45 +0000 (15:24 +0000)

Trivial merge