Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

G

gitreceive
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

ba837878

Commit ba837878 authored 8 years ago by nimrod

Downloads
- Plain Diff

Merge branch 'master' of /home/nimrod/Documents/Shore/Ansible/example

# Conflicts:
#	molecule.yml
#	tests/playbook.yml

parents cc5919f3 0390260e

No related branches found

No related tags found

No related merge requests found

Changes 6

Show whitespace changes

Inline Side-by-side

Showing

.travis.yml 15 additions, 2 deletions

.travis.yml
ansible.cfg 1 addition, 1 deletion

ansible.cfg
molecule.yml 14 additions, 8 deletions

molecule.yml
tests/playbook.yml 2 additions, 3 deletions

tests/playbook.yml
tests/requirements.txt 6 additions, 3 deletions

tests/requirements.txt
tests/requirements.yml 2 additions, 0 deletions

tests/requirements.yml

with 40 additions and 17 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment