Merge "Sample environment with old ServiceNetMap value"
authorJenkins <jenkins@review.openstack.org>
Mon, 23 Nov 2015 18:28:30 +0000 (18:28 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 23 Nov 2015 18:28:30 +0000 (18:28 +0000)

Trivial merge