Skip to content

Commit

Permalink
Merge remote-tracking branch 'oss_github_saaros/xml' into template4
Browse files Browse the repository at this point in the history
  • Loading branch information
Mika Eloranta committed Sep 6, 2013
2 parents e50919d + 0b4bdce commit a46f4bf
Show file tree
Hide file tree
Showing 2 changed files with 104 additions and 189 deletions.
2 changes: 2 additions & 0 deletions README.rst
Expand Up @@ -65,6 +65,7 @@ Installing the following Python libraries will add optional functionality:
* pyvsphere_ (VMWare virtual machine provisioning)
* libvirt-python_ (libvirt virtual machine provisioning)
* PyDNS_ (libvirt provisioning dependency)
* lxml_ (libvirt provisioning dependency)

.. _`Amazon EC2`: http://aws.amazon.com/ec2/
.. _Paramiko: http://pypi.python.org/pypi/paramiko
Expand All @@ -79,6 +80,7 @@ Installing the following Python libraries will add optional functionality:
.. _pyvsphere: https://github.com/F-Secure/pyvsphere
.. _libvirt-python: http://libvirt.org/python.html
.. _PyDNS: http://pydns.sourceforge.net/
.. _lxml: http://lxml.de/

Installation using pip or easy_install
--------------------------------------
Expand Down

0 comments on commit a46f4bf

Please sign in to comment.