fix merge
fix merge
adding wait timeout for xqueue
adding wait param to other calls
Merge pull request #1319 from edx/jarv/add-wait-timeout

Jarv/add wait timeout
Update the commoncluster play to remove repeats.
Merge pull request #1320 from edx/feanil/update_commoncluster_play

Update the commoncluster play to remove repeats.
separados los roles
memcached escuchando en 0.0.0.0
mysql escuchando en 0.0.0.0
bringing down the worker count to default to 2
Merge pull request #1322 from edx/jarv/bring-down-worker-count

bringing down the worker count to default to 2
adding dash

need to update the play tag and jenkins
Cluster all machines passed passed in.
fix typo
añadido login_host al modulo mysql_user
fix
Merge branch 'production' of https://github.com/apardo/configuration into production
remove login_host
añadidas variables