Merge "Upgrade ceph-osd"
authorJenkins <jenkins@review.openstack.org>
Fri, 2 Sep 2016 11:38:17 +0000 (11:38 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 2 Sep 2016 11:38:17 +0000 (11:38 +0000)

Trivial merge