Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

I

inventory-provider
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

e574b4b6

Commit e574b4b6 authored 4 years ago by Robert Latta

Downloads
- Plain Diff

Merge branch 'develop' into feature/DBOARD3-306

parents d5b05904 8ea55da6

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

Changelog.md 3 additions, 0 deletions

Changelog.md
inventory_provider/routes/default.py 26 additions, 25 deletions

inventory_provider/routes/default.py
inventory_provider/tasks/common.py 27 additions, 13 deletions

inventory_provider/tasks/common.py
inventory_provider/tasks/worker.py 2 additions, 1 deletion

inventory_provider/tasks/worker.py
test/test_celery_worker_global.py 2 additions, 1 deletion

test/test_celery_worker_global.py
test/test_general_routes.py 29 additions, 29 deletions

test/test_general_routes.py

with 89 additions and 69 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment