Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

N

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

Snippets Groups Projects

19a99f70

Commit 19a99f70 authored 8 years ago by nimrod

Downloads
- Plain Diff

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

# Conflicts:
#	README.rst
#	defaults/main.yml
#	handlers/main.yml
#	molecule.yml
#	tasks/main.yml
#	tests/playbook.yml
#	vars/main.yml

parents bf50f707 41ad1da6

No related branches found

No related tags found

Loading

Changes 15

Show whitespace changes

Inline Side-by-side

Showing

.pre-commit-config.yaml 1 addition, 1 deletion

.pre-commit-config.yaml
.travis.yml 24 additions, 0 deletions

.travis.yml
README.rst 11 additions, 8 deletions

README.rst
ansible.cfg 2 additions, 1 deletion

ansible.cfg
defaults/main.yml 1 addition, 1 deletion

defaults/main.yml
handlers/main.yml 1 addition, 1 deletion

handlers/main.yml
meta/main.yml 4 additions, 1 deletion

meta/main.yml
molecule.yml 19 additions, 2 deletions

molecule.yml
tasks/main.yml 4 additions, 2 deletions

tasks/main.yml
tests/playbook.yml 9 additions, 3 deletions

tests/playbook.yml
tests/requirements.txt 9 additions, 4 deletions

tests/requirements.txt
tests/requirements.yml 4 additions, 6 deletions

tests/requirements.yml
tests/test_example.py 6 additions, 1 deletion

tests/test_example.py
tests/test_nsd.py 5 additions, 0 deletions

tests/test_nsd.py
vars/main.yml 1 addition, 1 deletion

vars/main.yml

with 101 additions and 32 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