diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2013-06-02 14:20:37 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2013-06-02 14:20:37 -0500 |
| commit | 9de1086c937c5f8919cb279e7f601d7de064f901 (patch) | |
| tree | 83362fdb6ee6bfb17bc8aa1477cb5c06f54022ca /testsuite/install.sh | |
| parent | fdeba3b8f2cea7ecb2200cab42ce28fd1e1e6a5c (diff) | |
| parent | 521862b6584eb4d68e12df5d1a5c4f7a8ef1bdf5 (diff) | |
| download | bcfg2-9de1086c937c5f8919cb279e7f601d7de064f901.tar.gz bcfg2-9de1086c937c5f8919cb279e7f601d7de064f901.tar.bz2 bcfg2-9de1086c937c5f8919cb279e7f601d7de064f901.zip | |
Merge branch 'maint'
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Conflicts:
doc/installation/distributions.txt
doc/server/snapshots/index.txt
src/lib/Bcfg2/Server/Plugin/helpers.py
src/sbin/bcfg2-server
Diffstat (limited to 'testsuite/install.sh')
| -rwxr-xr-x | testsuite/install.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/testsuite/install.sh b/testsuite/install.sh index 1e0acbad6..43a6057c0 100755 --- a/testsuite/install.sh +++ b/testsuite/install.sh @@ -15,7 +15,7 @@ if [[ "$WITH_OPTIONAL_DEPS" == "yes" ]]; then if [[ ${PYVER:0:1} == "2" ]]; then # django supports py3k, but South doesn't, and the django bits # in bcfg2 require South - pip install cheetah 'django<1.5' South M2Crypto + pip install cheetah 'django<1.5' 'South<0.8' M2Crypto fi else # python < 2.6 requires M2Crypto for SSL communication, not just |