Linux-Help/formula-haproxy
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Removed broken conflict lines...

Browse source
This commit is contained in:
Konrad Mosoń 2015-11-24 21:46:02 +01:00
parent 78e7fb9d0d
commit 1b46ac219a
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
haproxy/templates/haproxy.jinja
View file

@ -64,11 +64,7 @@ global
{{- render_list_of_dictionaries('ssl-default-bind-options', salt['pillar.get']('haproxy:global:ssl-default-bind-options')) }} {{- render_list_of_dictionaries('ssl-default-bind-options', salt['pillar.get']('haproxy:global:ssl-default-bind-options')) }}
{%- endif %} {%- endif %}
<<<<<<< HEAD
{%- for id, userlist in salt['pillar.get']('haproxy:userlists', {}).items() %}
=======
{%- for id, userlist in salt['pillar.get']('haproxy:userlists', {})|dictsort %} {%- for id, userlist in salt['pillar.get']('haproxy:userlists', {})|dictsort %}
>>>>>>> Use dictsort instead of iteritems()/items()
#------------------ #------------------
# Global Userlists # Global Userlists
#------------------ #------------------