Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

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

Snippets Groups Projects

8490c814

Commit 8490c814 authored 7 years ago by nimrod

Downloads
- Plain Diff

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

# Conflicts:
#	meta/main.yml
#	tasks/main.yml
#	tests/playbook.yml

parents 4a5e2796 bd2a87de

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

.pre-commit-config.yaml 3 additions, 3 deletions

.pre-commit-config.yaml
.travis.yml 1 addition, 0 deletions

.travis.yml
docker-test/Dockerfile 3 additions, 0 deletions

docker-test/Dockerfile
docker-test/docker-test.bats 15 additions, 0 deletions

docker-test/docker-test.bats
meta/main.yml 5 additions, 5 deletions

meta/main.yml
tasks/main.yml 8 additions, 2 deletions

tasks/main.yml
tests/requirements.txt 4 additions, 4 deletions

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

tests/requirements.yml
tox.ini 6 additions, 6 deletions

tox.ini

with 47 additions and 20 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