Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

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

Snippets Groups Projects

ac2c8b89

Commit ac2c8b89 authored 8 years ago by nimrod

Downloads
- Plain Diff

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

# Conflicts:
#	.travis.yml

parents 6bddc2b8 d1c54835

Branches

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 11 additions, 6 deletions

.travis.yml
Jenkinsfile 38 additions, 0 deletions

Jenkinsfile
tests/requirements.txt 3 additions, 3 deletions

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

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

tox.ini

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