Commit 15d3c403 authored by nimrod's avatar nimrod
Browse files

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

# Conflicts:
#	molecule.yml
parents f41cd292 204af3dc

.travis.yml

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ cache: 
  - pip

  - directories:

      - $HOME/.pre-commit

      - $HOME/virtualenv



install:

  - pip install -r tests/requirements.txt | cat

tests/requirements.txt

+4 −4
Original line number Diff line number Diff line 
ansible==2.2.0.0

testinfra==1.4.4

molecule==1.15.0

ansible-lint==3.4.4

pre-commit==0.9.3

testinfra==1.4.5

molecule==1.16.1

ansible-lint==3.4.7

pre-commit==0.9.4

piprot==0.9.7

python-vagrant==0.5.14

docker-py==1.10.6