new file:   LICENSE
	new file:   README.md
	new file:   ansible_host
	new file:   playbook.yml
	new file:   roles/bacula/handlers/main.yml
	new file:   roles/bacula/tasks/Debian.yml
	new file:   roles/bacula/tasks/RedHat.yml
	new file:   roles/bacula/tasks/main.yml
	new file:   roles/bacula/templates/debian_bacula-fd.conf
	new file:   roles/bacula/templates/redhat_bacula-fd.conf
	new file:   roles/common/tasks/Debian.yml
	new file:   roles/common/tasks/RedHat.yml
	new file:   roles/common/tasks/main.yml
	new file:   roles/iptables/.bumpversion.cfg
	new file:   roles/iptables/.travis.yml
	new file:   roles/iptables/LICENSE
	new file:   roles/iptables/Makefile
	new file:   roles/iptables/README.md
	new file:   roles/iptables/defaults/main.yml
	new file:   roles/iptables/handlers/main.yml
	new file:   roles/iptables/meta/.galaxy_install_info
	new file:   roles/iptables/meta/main.yml
	new file:   roles/iptables/tasks/iptables.yml
	new file:   roles/iptables/tasks/main.yml
	new file:   roles/iptables/templates/etc/iptables.rules.j2
	new file:   roles/iptables/templates/etc/network/if-up.d/iptables_load.j2
	new file:   roles/iptables/test.yml
	new file:   roles/logwatch/defaults/main.yml
	new file:   roles/logwatch/tasks/main.yml
	new file:   roles/logwatch/templates/etc_logwatch_conf_logwatch.conf.j2
	new file:   roles/openssh/defaults/main.yml
	new file:   roles/openssh/handlers/main.yml
	new file:   roles/openssh/tasks/Debian.yml
	new file:   roles/openssh/tasks/RedHat.yml
	new file:   roles/openssh/tasks/main.yml
	new file:   roles/openssh/templates/etc_ssh_ssh_config.j2
	new file:   roles/openssh/templates/etc_ssh_sshd_config.j2
	new file:   roles/zabbix-agent/ansible.cfg
	new file:   roles/zabbix-agent/defaults/main.yml
	new file:   roles/zabbix-agent/handlers/main.yml
	new file:   roles/zabbix-agent/tasks/main.yml
	new file:   roles/zabbix-agent/templates/zabbix_agentd.conf.j2
	new file:   roles/zabbix-common/ansible.cfg
	new file:   roles/zabbix-common/defaults/main.yml
	new file:   roles/zabbix-common/handlers/main.yml
	new file:   roles/zabbix-common/tasks/Debian.yml
	new file:   roles/zabbix-common/tasks/RedHat.yml
	new file:   roles/zabbix-common/tasks/main.yml
	new file:   roles/zabbix-common/templates/zabbix.repo.j2
Merge branch 'master' of https://github.com/alancordoba/ansible

Conflicts:
	README.md

	modified:   README.md