diff options
| author | Muriithi Frederick Muriuki | 2018-02-05 15:38:26 +0300 |
|---|---|---|
| committer | Muriithi Frederick Muriuki | 2018-02-05 15:38:26 +0300 |
| commit | 93f6d69691d109ba4090c2eba82a72df13fbb060 (patch) | |
| tree | 301d62706082e3b76f84fd4b69bf76a8591d5c47 /etc | |
| parent | afaea1b1297d0cf08565746799d2900a6981823a (diff) | |
| parent | 4ae2d548127eeeaa7cec0baf1b788005b5e8e51d (diff) | |
| download | genenetwork2-93f6d69691d109ba4090c2eba82a72df13fbb060.tar.gz | |
Merge remote-tracking branch 'origin/testing' into testing
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 |