Merge "Update cinder-netapp-config environment"
authorJenkins <jenkins@review.openstack.org>
Wed, 5 Jul 2017 21:23:47 +0000 (21:23 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 5 Jul 2017 21:23:47 +0000 (21:23 +0000)

Trivial merge