Skip to content

Commit

Permalink
Merge branch 'master' of github.com:CIRCL/pystemon into prodbranch
Browse files Browse the repository at this point in the history
Conflicts:
	pystemon.py
  • Loading branch information
rommelfs committed Mar 6, 2020
2 parents 9d3991a + 66303e5 commit f7a499b
Show file tree
Hide file tree
Showing 4 changed files with 159 additions and 185 deletions.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ Features:
Python Dependencies
-------------------
* PyYAML
* BeautifulSoup
* requests
* redis

Limitations:
------------
Expand All @@ -43,4 +44,4 @@ Options:
-v outputs more information
Default configuration file: /etc/pystemon.yaml or pystemon.yaml in current directory
```
```
Loading

0 comments on commit f7a499b

Please sign in to comment.