Merge branch 'ansible_api' into ops_dev
# Conflicts: # apps/jumpserver/urls.py # apps/locale/zh/LC_MESSAGES/django.po # apps/templates/_nav.html # requirements.txt # run_server.py
Showing
No preview for this file type
This diff is collapsed.
apps/ops/api.py
deleted
100644 → 0
apps/ops/api/__init__.py
0 → 100644
apps/ops/api/exc.py
0 → 100644
apps/ops/api/permissions.py
0 → 100644
apps/ops/api/serializers.py
0 → 100644
apps/ops/api/views.py
0 → 100644
apps/ops/models.py
deleted
100644 → 0
apps/ops/models/__init__.py
0 → 100644
apps/ops/models/ansible.py
0 → 100644
apps/ops/models/cron.py
0 → 100644
apps/ops/models/sudo.py
0 → 100644
apps/ops/tasks.py
deleted
100644 → 0
apps/ops/tasks/__init__.py
0 → 100644
apps/ops/tasks/taskers.py
0 → 100644
This diff is collapsed.
This diff is collapsed.
apps/ops/tests/__init__.py
0 → 100644
apps/ops/urls.py
0 → 100644
apps/ops/utils.py
deleted
100644 → 0
apps/ops/utils/__init__.py
0 → 100644
This diff is collapsed.
apps/ops/utils/mixins.py
0 → 100644
... | ... | @@ -6,7 +6,7 @@ djangorestframework==3.4.5 |
ForgeryPy==0.1 | ||
openpyxl==2.4.0 | ||
celery==3.1.23 | ||
ansible==2.1.1.0 | ||
ansible==2.1.2.0 | ||
django-simple-captcha==0.5.2 | ||
django-formtools==1.0 | ||
sshpubkeys==2.2.0 | ||
... | ... | @@ -14,4 +14,7 @@ djangorestframework-bulk==0.2.1 |
paramiko==2.0.2 | ||
django-redis-cache==1.7.1 | ||
requests==2.11.1 | ||
itsdangerous==0.24 | ||
\ No newline at end of file | ||
itsdangerous==0.24 | ||
python-gssapi==0.6.4 | ||
tornado==4.4.2 | ||
eventlet==0.19.0 |
Please
register
or
sign in
to comment