diff options
| author | zsloan | 2018-01-30 10:30:22 -0600 |
|---|---|---|
| committer | GitHub | 2018-01-30 10:30:22 -0600 |
| commit | 1a00b3976f770865f47d4526db92131704b55797 (patch) | |
| tree | 6fa4e488c9c601a5907e0c251fa7eec7f4a94a12 /etc | |
| parent | 4634cf87761980a1682473211259698b7be720e4 (diff) | |
| parent | f60d49527bedfc1ecda401f49fae9c9a5bbcf5f9 (diff) | |
| download | genenetwork2-1a00b3976f770865f47d4526db92131704b55797.tar.gz | |
Merge pull request #274 from pjotrp/pjotr
Add gunicorn support
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/VERSION | 2 | ||||
| -rw-r--r-- | etc/default_settings.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/etc/VERSION b/etc/VERSION index b624c74a..ca9e199c 100644 --- a/etc/VERSION +++ b/etc/VERSION @@ -1 +1 @@ -2.10rc5 +2.11-rc1 diff --git a/etc/default_settings.py b/etc/default_settings.py index 59e22f1a..699d21f1 100644 --- a/etc/default_settings.py +++ b/etc/default_settings.py @@ -27,7 +27,7 @@ import sys GN_VERSION = open("../etc/VERSION","r").read() SQL_URI = "mysql://gn2:mysql_password@localhost/db_webqtl_s" SQL_ALCHEMY_POOL_RECYCLE = 3600 -GN_SERVER_URL = "http://localhost:8880/" +GN_SERVER_URL = "http://localhost:8880/" # REST API server # ---- Flask configuration (see website) TRAP_BAD_REQUEST_ERRORS = True |