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

Merge branch 'master' into feature/platforms

# Conflicts:
#	.travis.yml
parents 8876c428 49a22570
No related branches found
No related tags found
No related merge requests found
---
language: python
python: ["2.7", "3.2"]
python: ["2.7", "3.4"]
dist: trusty
sudo: True
group: beta
......@@ -26,7 +26,7 @@ env:
matrix:
fast_finish: True
allow_failures:
- python: "3.2"
- python: "3.4"
- env:
- *openbsd59
- *jessie
......
......@@ -2,7 +2,7 @@ ansible==2.2.0.0
testinfra==1.5.1
molecule==1.17.3
ansible-lint==3.4.9
pre-commit==0.9.4
pre-commit==0.10.1
piprot==0.9.7
python-vagrant==0.5.14
docker-py==1.10.6
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment