Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

D

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

Snippets Groups Projects

659fcb8f

Commit 659fcb8f authored 7 years ago by nimrod

Downloads
- Plain Diff

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

# Conflicts:
#	.travis.yml
#	meta/main.yml
#	molecule.yml
#	tasks/main.yml

parents 79d1f341 d5ce1eab

Branches master

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
.pre-commit-config.yaml 5 additions, 17 deletions

.pre-commit-config.yaml
.travis.yml 16 additions, 12 deletions

.travis.yml
Jenkinsfile 38 additions, 0 deletions

Jenkinsfile
README.rst 3 additions, 15 deletions

README.rst
meta/main.yml 1 addition, 1 deletion

meta/main.yml
molecule.yml 15 additions, 1 deletion

molecule.yml
tests/requirements.txt 6 additions, 8 deletions

tests/requirements.txt
tests/test_example.py 5 additions, 5 deletions

tests/test_example.py
tox.ini 31 additions, 0 deletions

tox.ini

with 121 additions and 59 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