Merge branch 'develop' into develop-2.7

2019-11-01 16:19:36 -04:00
parent cf5c24ee2d a2a83a4a4c
commit b8f1585976
32 changed files with 397 additions and 99 deletions
--- a/docs/installation/2-netbox.md
+++ b/docs/installation/2-netbox.md
@@ -129,6 +129,7 @@ DATABASE = {
    'PASSWORD': 'J5brHrAXFLQSif0K', # PostgreSQL password
    'HOST': 'localhost',            # Database server
    'PORT': '',                     # Database port (leave blank for default)
+    'CONN_MAX_AGE': 300,            # Max database connection age
 }
 ```