diff options
| author | Pjotr Prins | 2016-10-11 12:11:32 +0000 |
|---|---|---|
| committer | Pjotr Prins | 2016-10-11 12:11:32 +0000 |
| commit | f942b4b6c0818010be9b9d245d9e02d2f466f29e (patch) | |
| tree | 86650fa8fa7836e7d4c39907174dba98a39c59e9 /etc | |
| parent | 420fd69ceda63871e9f6755112769c5615ed45f6 (diff) | |
| parent | ccfe1f2e1afac31de9d1b2f34ad66ed77a517202 (diff) | |
| download | genenetwork2-f942b4b6c0818010be9b9d245d9e02d2f466f29e.tar.gz | |
Merge branch 'testing' into chfi
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/default_settings.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/etc/default_settings.py b/etc/default_settings.py index e03e2781..29b96861 100644 --- a/etc/default_settings.py +++ b/etc/default_settings.py @@ -22,6 +22,7 @@ import os import sys +GN_VERSION = open("../VERSION","r").read() SQL_URI = "mysql://gn2:mysql_password@localhost/db_webqtl_s" SQLALCHEMY_DATABASE_URI = 'mysql://gn2:mysql_password@localhost/db_webqtl_s' SQLALCHEMY_POOL_RECYCLE = 3600 |