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

2017-07-15 13:51:15 +08:00 · 2017-07-15 13:51:15 +08:00 · 61014c747e
parent b2ba1f3ca5 7c154abf70
commit 61014c747e
1 changed files with 1 additions and 1 deletions
--- 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