diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-06-28 20:50:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-06-28 20:50:46 +0000 |
| commit | 98e4a4bf56efb254645b15a9bcd06ab3075480c6 (patch) | |
| tree | 2405b090372036f9d995f88fe2e5b0dc4ce2fe7f /kolla | |
| parent | b500866531fa8bcae9ae09a6fe28de276e3e1724 (diff) | |
| parent | e313c896219b3942d66a00d5388ba2cda6bcce87 (diff) | |
| download | kolla-98e4a4bf56efb254645b15a9bcd06ab3075480c6.tar.gz kolla-98e4a4bf56efb254645b15a9bcd06ab3075480c6.zip | |
Merge "Introduce merge and preserve_properties for config_files"
Diffstat (limited to 'kolla')
0 files changed, 0 insertions, 0 deletions