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

325166f0

Commit 325166f0 authored 8 years ago by nimrod

Downloads
- Plain Diff

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

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

parents f936dae0 c508b943

No related branches found

No related tags found

Loading

Changes 6

Show whitespace changes

Inline Side-by-side

Showing

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

.pre-commit-config.yaml
.travis.yml 9 additions, 6 deletions

.travis.yml
README.rst 2 additions, 3 deletions

README.rst
molecule.yml 2 additions, 45 deletions

molecule.yml
tasks/main.yml 1 addition, 1 deletion

tasks/main.yml
tests/requirements.txt 0 additions, 1 deletion

tests/requirements.txt

with 15 additions and 57 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