Merge branch 'master' of github.com:Storj/dataserv into develop

Conflicts: dataserv/config.py
StorjOld · Dec 27, 2015 · 7da0b6b · 7da0b6b
2 parents 8bdd033 + 65b89f1
commit 7da0b6b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/dataserv/config.py b/dataserv/config.py
@@ -33,9 +33,9 @@
                     level=logging.DEBUG)
 TOTAL_UPDATE = 30  # minutes
 
-if os.environ.get("DATASERV_CACHING_TIME"):  # pragma: no cover
+if os.environ.get("DATASERV_CACHING_TIME"):
     CACHING_TIME = int(os.environ.get("DATASERV_CACHING_TIME"))
 else:
     CACHING_TIME = 30  # seconds
-    
+
 DISABLE_CACHING = not bool(CACHING_TIME)