Merge branch 'dev' of github.com:jumpserver/jumpserver into dev

61014c74 · ibuler · b2ba1f3c · 7c154abf · 61014c74
Commit 61014c74 authored Jul 15, 2017 by ibuler
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

tasks.py apps/assets/tasks.py +1 -1

No files found.
--- a/apps/assets/tasks.py
+++ b/apps/assets/tasks.py
@@ -72,7 +72,7 @@ def test_admin_user_connective_period():
    for i in summary['success']:
        cache.set(i, '1', 2*60*60*60)

-    for i in summary['failed']:
+    for i, msg in summary['failed']:
        cache.set(i, '0', 60*60*60)
    return summary