Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/expose agent group in the scan #703

Merged
merged 21 commits into from
Jun 20, 2024

Conversation

oussamaessaji
Copy link
Member

No description provided.

ostorlab added 3 commits June 10, 2024 18:12
…e_scan' into feature/expose_agent_group_in_the_scan

# Conflicts:
#	src/ostorlab/serve_app/types.py
ErebusZ
ErebusZ previously approved these changes Jun 11, 2024
3asm
3asm previously approved these changes Jun 11, 2024
elyousfi5
elyousfi5 previously approved these changes Jun 12, 2024
ostorlab added 2 commits June 12, 2024 11:41
@oussamaessaji oussamaessaji dismissed stale reviews from elyousfi5 and 3asm via 8aed95c June 12, 2024 10:41
@3asm
Copy link
Member

3asm commented Jun 14, 2024

Please resolve conflict.

ostorlab added 4 commits June 14, 2024 12:34
…group_in_the_scan

# Conflicts:
#	src/ostorlab/serve_app/types.py
#	tests/conftest.py
#	tests/serve_app/oxo_test.py
…group_in_the_scan

# Conflicts:
#	src/ostorlab/serve_app/oxo.py
#	src/ostorlab/serve_app/types.py
…group_in_the_scan

# Conflicts:
#	src/ostorlab/serve_app/types.py
#	tests/serve_app/oxo_test.py
@3asm 3asm merged commit 6bb1e48 into main Jun 20, 2024
10 checks passed
@3asm 3asm deleted the feature/expose_agent_group_in_the_scan branch June 20, 2024 12:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants