Commit a7e0f114 authored Jan 10, 2017 by nimrod

Merge branch 'master' into feature/platforms

# Conflicts:
#	.travis.yml

parents 8876c428 49a22570

.travis.yml

+2 −2

Original line number	Diff line number	Diff line
		---
		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

tests/requirements.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -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