tree acb60a3ceca4d100410b69c73387b44896f40a0a
parent 73402c7d285b12679a7ff143831c8856057ef026
parent 69e3d4772b5b22e3bc80e969ecf5bf4e715c8840
author Zuul <zuul@review.openstack.org> 1519848408 +0000
committer Gerrit Code Review <review@openstack.org> 1519848408 +0000

Merge "Revert "Remove duplicate configuration""