merged kahun/pr/153

This commit is contained in:
phre4k 2015-04-05 16:26:28 +02:00
commit 9417a3b9d5

View File

@ -501,6 +501,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
* [mitmproxy](http://mitmproxy.org/) - A Python tool used for intercepting, viewing and modifying network traffic. Invaluable in troubleshooting certain problems. * [mitmproxy](http://mitmproxy.org/) - A Python tool used for intercepting, viewing and modifying network traffic. Invaluable in troubleshooting certain problems.
* [Sysdig](http://www.sysdig.org/) - Capture system state and activity from a running Linux instance, then save, filter and analyze. * [Sysdig](http://www.sysdig.org/) - Capture system state and activity from a running Linux instance, then save, filter and analyze.
* [Trinity Rescue Kit](http://trinityhome.org) - Linux Live CD for general computer troubleshooting.
* [Wireshark](http://www.wireshark.org/) - The world's foremost network protocol analyzer. * [Wireshark](http://www.wireshark.org/) - The world's foremost network protocol analyzer.
## Project Management ## Project Management