Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 76e34cf 1a4ece1)
Merge "Keep existing data for containerized ironic-conductor"
authorJenkins <jenkins@review.openstack.org>
Tue, 21 Mar 2017 10:40:05 +0000 (10:40 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 21 Mar 2017 10:40:05 +0000 (10:40 +0000)

Trivial merge