Merge branch 'integration' into 'pytest' (02dac133) · Commits · flame / flame-clmc · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

F

flame-clmc
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents

Snippets Groups Projects

02dac133

Commit 02dac133 authored 7 years ago by Michael Boniface

Downloads
- Plain Diff

Merge branch 'integration' into 'pytest'

# Conflicts:
#   test/telegraf-agents/test_telegraf_agents.py

parents 7adc1bf7 69e25c60

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

test/services/ipendpoint/telegraf_ipendpoint.conf 0 additions, 65 deletions

test/services/ipendpoint/telegraf_ipendpoint.conf
test/streaming-sim/StreamingSim.py 27 additions, 15 deletions

test/streaming-sim/StreamingSim.py
test/streaming-sim/rspec.yml 5 additions, 5 deletions

test/streaming-sim/rspec.yml
test/telegraf-agents/rspec.yml 2 additions, 2 deletions

test/telegraf-agents/rspec.yml
test/telegraf-agents/test_telegraf_agents.py 28 additions, 18 deletions

test/telegraf-agents/test_telegraf_agents.py

with 62 additions and 105 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