summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2017-08-18 15:01:32 -0500
committerSol Jerome <sol.jerome@gmail.com>2017-08-18 15:01:32 -0500
commite193079d1779e4d66d80882e6f1c3ff9ba05619b (patch)
treeb47f262f3b7d57a1ddeefd0f2aeba3bb35539d18 /doc
parentcd0f5f5f62376f7dc64e5c5c7d59a7c6bfcb918f (diff)
parent0fdabbcb4668d5f70f76c08a6e3216c5542e7457 (diff)
downloadbcfg2-e193079d1779e4d66d80882e6f1c3ff9ba05619b.tar.gz
bcfg2-e193079d1779e4d66d80882e6f1c3ff9ba05619b.tar.bz2
bcfg2-e193079d1779e4d66d80882e6f1c3ff9ba05619b.zip
Merge branch 'feature/travis-container' of https://github.com/AlexanderS/bcfg2
Diffstat (limited to 'doc')
-rw-r--r--doc/installation/prerequisites.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/installation/prerequisites.txt b/doc/installation/prerequisites.txt
index d45599955..e6de2a9f6 100644
--- a/doc/installation/prerequisites.txt
+++ b/doc/installation/prerequisites.txt
@@ -56,7 +56,8 @@ Bcfg2 Server
+-------------------------------+----------+--------------------------------+
| python-gamin or pyinotify | Any | gamin or inotify, python |
+-------------------------------+----------+--------------------------------+
-| python-ssl (note | Any | python, backported ssl module |
+| python-ssl (this is included | Any | |
+| in Python2.6 and later) | | |
+-------------------------------+----------+--------------------------------+
| python-setuptools | Any | |
+-------------------------------+----------+--------------------------------+