Merge branch 'master' of /git/ansible

This commit is contained in:
Rick Elrod 2014-07-17 19:47:39 +00:00
commit e106a24f23

View file

@ -5,10 +5,10 @@ num_cpus: 2
slave_user: buildslave
taskotron_fas_user: taskotron
resultsdb_server: http://resultsdb-stg01.qa.fedoraproject.org/resultsdb/api/v1.0/
resultsdb_server: http://resultsdb-stg01.qa.fedoraproject.org/resultsdb_api/api/v1.0/
bodhi_server: http://10.5.124.232/fakefedorainfra/bodhi/
kojihub_url: http://koji.fedoraproject.org/kojihub
taskotron_master: http://taskotron.stg.fedoraproject.org/taskmaster/
taskotron_master: https://taskotron.stg.fedoraproject.org/taskmaster/
deployment_type: stg
slave_home: /home/buildslave/
slave_dir: /home/buildslave/slave