tree 29e1fabd798b39d21a8cb42082237837d5c3302d
parent c5dc2adb4f1f58fe5e6931fd05e33a5468d906eb
parent 1da2024f66b8bb3319ea432a3969da7071d42bc4
author Ales Komarek <akomarek@mirantis.com> 1500364010 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> 1500364011 +0000

Merge "Fix conflict between OpenStack and Telemetry VIP"