Merge branch 'master' into librarian

Conflicts: examples/openstack/openstack.py
2015-10-20 13:24:58 +02:00
parent 8da98c3c80 21c42b56ca
commit 8c1dc6623a
39 changed files with 925 additions and 34 deletions
--- a/bootstrap/playbooks/tasks/base.yaml
+++ b/bootstrap/playbooks/tasks/base.yaml
@@ -30,6 +30,8 @@
  - python-virtualenv
  # Required by packer
  - build-essential
+  # for torrent transport
+  - python-libtorrent

 # PIP
 #- apt: name=python-pip state=absent