commit | 510d198883427b38995c473b88649ed6713f0e2e | [log] [tgz] |
---|---|---|
author | Monty Taylor <mordred@inaugust.com> | Wed Aug 23 08:26:09 2017 -0400 |
committer | Monty Taylor <mordred@inaugust.com> | Wed Aug 23 08:27:17 2017 -0400 |
tree | 0b88759a671db6a76bf8b174d58150dfc5d02b9d | |
parent | 2477c0548f5067a7f499e0a18af319f300522351 [diff] | |
parent | c1c11241d825977abc2cee01bbcca407cbb39454 [diff] |
Merge branch 'master' into feature/zuulv3 Null-merged https://review.openstack.org/#/c/254957/ as the thing it was doing needs independent thought. Change-Id: I1af5f2f3bcffa84058dba61d990e0e7c9b6a4b23