github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-29 08:37:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver

Browse Source 
Conflicts:
	docs/AddUserAsset.py
This commit is contained in:
guanghongwei
2015-03-07 17:39:10 +08:00
parent 9a638bc856 5bf66ca92e
commit c9928fc1f9
12 changed files with 156 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
docs/AddUserAsset.py
View File

@@ -108,11 +108,12 @@ def test_add_log():
if __name__ == '__main__':
#test_add_dept()
#test_add_group()
#test_add_user()
#test_add_idc()
#test_add_asset_group()
test_add_asset()
test_add_dept()
test_add_group()
test_add_user()
test_add_idc()
test_add_asset_group()
test_add_asset()
test_add_log()