merged with primogen v8.

Author: steenzout

README.md

@@ -4,6 +4,18 @@
 [![Build Status](https://travis-ci.org/ansiblebit/launchpad-ppa-webupd8.svg?branch=master)](https://travis-ci.org/ansiblebit/launchpad-ppa-webupd8)
 
 [![Platform](http://img.shields.io/badge/platform-debian-a80030.svg?style=flat)](#)
+<<<<<<< HEAD
+=======
+[![Platform](http://img.shields.io/badge/platform-centos-932279.svg?style=flat)](#)
+[![Platform](http://img.shields.io/badge/platform-fedora-3c6eb4.svg?style=flat)](#)
+[![Platform](http://img.shields.io/badge/platform-freebsd-ae0000.svg?style=flat)](#)
+[![Platform](http://img.shields.io/badge/platform-macosx-000000.svg?style=flat)](#)
+[![Platform](http://img.shields.io/badge/platform-mint-87cfbe.svg?style=flat)](#)
+[![Platform](http://img.shields.io/badge/platform-opensuse-73ba25.svg?style=flat)](#)
+[![Platform](http://img.shields.io/badge/platform-redhat-cc0000.svg?style=flat)](#)
+[![Platform](http://img.shields.io/badge/platform-sles-73ba25.svg?style=flat)](#)
+[![Platform](http://img.shields.io/badge/platform-smartos-487487.svg?style=flat)](#)
+>>>>>>> b3b181c56b985c7a04151b31a06b59533cd06d9b
 [![Platform](http://img.shields.io/badge/platform-ubuntu-dd4814.svg?style=flat)](#)
 
 [![Project Stats](https://www.openhub.net/p/ansiblebit-launchpad-ppa-webupd8/widgets/project_thin_badge.gif)](https://www.openhub.net/p/ansiblebit-launchpad-ppa-webupd8/)
@@ -20,6 +32,21 @@ An [Ansible](http://www.ansible.com) role to setup the [webupd8](http://www.webu
 | Debian | Ubuntu  | Trusty  | [![x86_64](http://img.shields.io/badge/x86_64-passed-006400.svg?style=flat)](#) |
 | Debian | Ubuntu  | Vivid   | [![x86_64](http://img.shields.io/badge/x86_64-passed-006400.svg?style=flat)](#) |
 
+## Tests
+
+| Family | Distribution | Version | Test Status |
+|:-:|:-:|:-:|:-:|
+| Debian | Debian  | Jessie  | [![x86](http://img.shields.io/badge/x86-n/a-cccccc.svg?style=flat)](#) [![x86_64](http://img.shields.io/badge/x86_64-n/a-cccccc.svg?style=flat)](#) |
+| Debian | Debian  | Wheezy  | [![x86](http://img.shields.io/badge/x86-n/a-cccccc.svg?style=flat)](#) [![x86_64](http://img.shields.io/badge/x86_64-n/a-cccccc.svg?style=flat)](#) |
+| Debian | Ubuntu  | Precise | [![x86](http://img.shields.io/badge/x86-n/a-cccccc.svg?style=flat)](#) [![x86_64](http://img.shields.io/badge/x86_64-passed-006400.svg?style=flat)](#)  |
+| Debian | Ubuntu  | Trusty  | [![x86](http://img.shields.io/badge/x86-n/a-cccccc.svg?style=flat)](#) [![x86_64](http://img.shields.io/badge/x86_64-n/a-cccccc.svg?style=flat)](#) |
+| Debian | Ubuntu  | Vivid   | [![x86](http://img.shields.io/badge/x86-n/a-cccccc.svg?style=flat)](#) [![x86_64](http://img.shields.io/badge/x86_64-n/a-cccccc.svg?style=flat)](#) |
+| RedHat | CentOS  | 6.4     | [![x86](http://img.shields.io/badge/x86-n/a-cccccc.svg?style=flat)](#) [![x86_64](http://img.shields.io/badge/x86_64-n/a-cccccc.svg?style=flat)](#) |
+| RedHat | CentOS  | 6.6     | [![x86](http://img.shields.io/badge/x86-n/a-cccccc.svg?style=flat)](#) [![x86_64](http://img.shields.io/badge/x86_64-n/a-cccccc.svg?style=flat)](#) |
+| RedHat | Centos  | 7       | [![x86](http://img.shields.io/badge/x86-n/a-cccccc.svg?style=flat)](#) [![x86_64](http://img.shields.io/badge/x86_64-n/a-cccccc.svg?style=flat)](#) |
+| RedHat | Fedora  | 20      | [![x86](http://img.shields.io/badge/x86-n/a-cccccc.svg?style=flat)](#) [![x86_64](http://img.shields.io/badge/x86_64-n/a-cccccc.svg?style=flat)](#) |
+| RedHat | Fedora  | 21      | [![x86](http://img.shields.io/badge/x86-n/a-cccccc.svg?style=flat)](#) [![x86_64](http://img.shields.io/badge/x86_64-n/a-cccccc.svg?style=flat)](#) |
+
 ## Requirements
 
 - ansible >= 1.8.4

tox.ini

@@ -1,20 +1,22 @@
 [tox]
 envlist =
-#    {py27}-{ansible192,ansible184,ansible172,ansible1610,ansible155,ansible145,ansible134,ansible123}
-    {py27}-{ansible192,ansible184,ansible172}
+#    {py27}-{ansible193,ansible184,ansible172,ansible1610,ansible155,ansible145,ansible134,ansible123}
+    {py27}-{ansible193,ansible184,ansible172}
 
 skipsdist = True
 
 
 [testenv]
 changedir = tests
 deps =
-    travis: ansible==1.9.2
-    ansible192: ansible==1.9.2
+    travis: ansible==1.9.3
+    ansible193: ansible==1.9.3
     ansible184: ansible==1.8.4
 
 passenv = ANSIBLE_ASK_SUDO_PASS HOME
 
+passenv = ANSIBLE_ASK_SUDO_PASS HOME
+
 commands =
     bash -c "test -s ../requirements.yml && ansible-galaxy install --force -r ../requirements.yml || true"
     bash vagrant.sh {posargs}