fix conflicts, add 5.4.x support

This commit is contained in:
Josh Lay 2019-12-27 09:15:50 -06:00
commit 81d6159d8c

View file

@ -3,3 +3,4 @@ localhost
[buildservers:vars] [buildservers:vars]
ansible_connection=local ansible_connection=local
ansible_python_interpreter=/usr/bin/python3