diff options
author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2017-09-25 11:50:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-25 11:50:11 +0100 |
commit | 94133d7ce8ab8dca8b8f47c0f2666d59486884a5 (patch) | |
tree | d472d3d5530e45eee0c156a0446bf42da0a81288 /jenkins-dendron-haproxy-postgres.sh | |
parent | Fix iteration of requests_missing_keys; list doesn't have .values() (diff) | |
parent | Fix logcontxt leak in keyclient (#2465) (diff) | |
download | synapse-94133d7ce8ab8dca8b8f47c0f2666d59486884a5.tar.xz |
Merge branch 'develop' into develop
Diffstat (limited to 'jenkins-dendron-haproxy-postgres.sh')
-rwxr-xr-x | jenkins-dendron-haproxy-postgres.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/jenkins-dendron-haproxy-postgres.sh b/jenkins-dendron-haproxy-postgres.sh index d64b2d2c9d..07979bf8b8 100755 --- a/jenkins-dendron-haproxy-postgres.sh +++ b/jenkins-dendron-haproxy-postgres.sh @@ -17,6 +17,7 @@ export HAPROXY_BIN=/home/haproxy/haproxy-1.6.11/haproxy ./sytest/jenkins/prep_sytest_for_postgres.sh ./sytest/jenkins/install_and_run.sh \ + --python $WORKSPACE/.tox/py27/bin/python \ --synapse-directory $WORKSPACE \ --dendron $WORKSPACE/dendron/bin/dendron \ --haproxy \ |