Merge branch 'dev' into test

coco/interactive.py

@@ -201,7 +201,7 @@ class InteractiveServer:
 
     def display_group_assets(self, _id):
         if _id > len(self.asset_groups) or _id <= 0:
-            self.client.send(wr(warning("Not match group, select again")))
+            self.client.send(wr(warning("No matched group, select again")))
             self.display_asset_groups()
             return
 

requirements/requirements.txt

@@ -30,5 +30,5 @@ tornado==4.5.2
 urllib3==1.22
 wcwidth==0.1.7
 werkzeug==0.12.2
-jumpserver-python-sdk==0.0.28
+jumpserver-python-sdk==0.0.29
 jms-es-sdk