Merge "Add option to diff containers after config stage."
authorJenkins <jenkins@review.openstack.org>
Fri, 24 Feb 2017 21:41:38 +0000 (21:41 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 24 Feb 2017 21:41:38 +0000 (21:41 +0000)

Trivial merge