Skip to content
Snippets Groups Projects
Commit f39051a9 authored by nimrod's avatar nimrod
Browse files

Merge branch 'master' into feature/tox_env 

# Conflicts:
#	tests/requirements.txt
parents e5153293 4ca4f85c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 3 deletions
tests/requirements.txt
+ 4
− 3
View file @ f39051a9
ansible==2.2.2.0
testinfra==1.5.4
molecule==1.23.0
ansible==2.3.0.0
testinfra==1.5.5
molecule==1.23.2
ansible-lint==3.4.12
pre-commit==0.13.6
python-vagrant==0.5.14
netaddr==0.7.19
passlib==1.7.1
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment