merge with 2.3.40

This commit is contained in:
m0duspwnens
2021-03-23 14:34:52 -04:00
53 changed files with 1920 additions and 1234 deletions

View File

@@ -0,0 +1,4 @@
60c60
< database, name, query, resample_time, coverage_period
---
> database, name, query, resample_time, coverage_period, **client_args

View File

@@ -0,0 +1,4 @@
38c38
< hours = int(duration.split("h"))
---
> hours = int(duration.split("h")[0])