From 1b7839e776f4f6a9b3f94512935c1013d34be67e Mon Sep 17 00:00:00 2001
From: rezen <an2dres5m@gmail.com>
Date: Mon, 23 Jun 2014 08:03:41 -0700
Subject: [PATCH 01/25] Added Servers for Hackers

At some point, every programmer finds themselves needing to know their way around a server.

Servers for Hackers is a newsletter for those times.
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4fef5bc..f40c95d 100644
--- a/README.md
+++ b/README.md
@@ -353,6 +353,7 @@ Various resources, such as books, websites and articles, for improving your skil
 
 * [Ops School](http://www.opsschool.org) - Comprehensive program that will help you learn to be an operations engineer.
 * [Dotdeb](http://www.dotdeb.org/) - Repository with LAMP updated packages.
+* [Servers for Hackers](http://serversforhackers.com/) - Newsletter for programmers who find themselves needing to know their way around a server.
 
 # Contributing
 Please see [CONTRIBUTING](https://github.com/kahun/awesome-sysadmin/blob/master/CONTRIBUTING.md) for details.
-- 
GitLab


From 465fa18ccd687a7d210551cef4d412ee7c882cc1 Mon Sep 17 00:00:00 2001
From: Benjamin Dos Santos <benjamin.dossantos@gmail.com>
Date: Wed, 25 Jun 2014 20:04:48 +0200
Subject: [PATCH 02/25] Add service discovery section and Consul.

Consul is a tool for service discovery, monitoring and configuration.
---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index b5e9307..f874799 100644
--- a/README.md
+++ b/README.md
@@ -79,6 +79,10 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 * [Rundeck](http://rundeck.org/) - Simple orchestration tool.
 * [Salt](http://www.saltstack.com/) - It's written in Python.
 
+## Service discovery
+
+* [Consul](http://www.consul.io/) - Consul is a tool for service discovery, monitoring and configuration.
+
 ## Cloud Storage
 
 * [git-annex assistant](http://git-annex.branchable.com/assistant/) - A synchronised folder on each of your OSX and Linux computers, Android devices, removable drives, NAS appliances, and cloud services.
-- 
GitLab


From f615d00674b03ebb0ede8536083c48f0703240dc Mon Sep 17 00:00:00 2001
From: Benjamin Dos Santos <benjamin.dossantos@gmail.com>
Date: Wed, 25 Jun 2014 20:08:03 +0200
Subject: [PATCH 03/25] Add ZooKeeper to service discover section.

ZooKeeper is a centralized service for maintaining configuration information,
naming, providing distributed synchronization, and providing group services.
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index f874799..4965061 100644
--- a/README.md
+++ b/README.md
@@ -82,6 +82,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 ## Service discovery
 
 * [Consul](http://www.consul.io/) - Consul is a tool for service discovery, monitoring and configuration.
+* [ZooKeeper](http://zookeeper.apache.org/) - ZooKeeper is a centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services.
 
 ## Cloud Storage
 
-- 
GitLab


From 066c0e5e33f779ca41e92ef3527dc1137ffb5749 Mon Sep 17 00:00:00 2001
From: Benjamin Dos Santos <benjamin.dossantos@gmail.com>
Date: Wed, 25 Jun 2014 20:20:04 +0200
Subject: [PATCH 04/25] Add Doozerd to service discovery section.

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4965061..1ff8c10 100644
--- a/README.md
+++ b/README.md
@@ -83,6 +83,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 
 * [Consul](http://www.consul.io/) - Consul is a tool for service discovery, monitoring and configuration.
 * [ZooKeeper](http://zookeeper.apache.org/) - ZooKeeper is a centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services.
+* [Doozerd](https://github.com/ha/doozerd) - Doozer is a highly-available, completely consistent store for small amounts of extremely important data.
 
 ## Cloud Storage
 
-- 
GitLab


From a69c140a5786cf7acb0a0f2470723aba60113355 Mon Sep 17 00:00:00 2001
From: Hunter Thornsberry <hunter@hunterthornsberry.com>
Date: Fri, 27 Jun 2014 00:36:36 -0400
Subject: [PATCH 05/25] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 2aff8bb..267b80c 100644
--- a/README.md
+++ b/README.md
@@ -234,6 +234,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 * [OpenTSDB](http://opentsdb.net/) - Store and server massive amounts of time series data without losing granularity.
 * [RRDtool](http://oss.oetiker.ch/rrdtool/) - Open source industry standard, high performance data logging and graphing system for time series data.
 * [Statsd](https://github.com/etsy/statsd/) - Application statistic listener.
+* [Dash](https://github.com/afaqurk/linux-dash) - A low-overhead monitoring web dashboard for a GNU/Linux machine.
 
 ## Network Configuration Management
 *Network configuration management tools.*
-- 
GitLab


From 4c37677597bd2bb6c0efdaa9cc3a9f1f0b66dfe6 Mon Sep 17 00:00:00 2001
From: Fred Kelly <fred@bitnami.com>
Date: Thu, 26 Jun 2014 16:56:55 -0700
Subject: [PATCH 06/25] adds Bitnami to Virtualization section

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 2aff8bb..cfd9093 100644
--- a/README.md
+++ b/README.md
@@ -364,6 +364,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 ## Virtualization
 *Virtualization software.*
 
+* [Bitnami](https://bitnami.com/) - Freely available VMs for applications described in this list: [GitLab](https://bitnami.com/stack/gitlab), [Jenkins](https://bitnami.com/stack/jenkins), [MantisBT](https://bitnami.com/stack/mantis), [Redmine](https://bitnami.com/stack/redmine), [Trac](https://bitnami.com/stack/trac) and [more](https://bitnami.com/stacks).
 * [Ganeti](https://code.google.com/p/ganeti/) - Cluster virtual server management software tool built on top of KVM and Xen.
 * [KVM](http://www.linux-kvm.org) - Linux kernel virtualization infrastructure.
 * [oVirt](http://www.ovirt.org/) - Manages virtual machines, storage and virtual networks.
-- 
GitLab


From 118dcd3ad8a2553d57799074edf51add9117c415 Mon Sep 17 00:00:00 2001
From: Tony Walker <walkr@users.noreply.github.com>
Date: Thu, 26 Jun 2014 22:35:34 -0700
Subject: [PATCH 07/25] Add LeoFS to Distributed Filesystems

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 2aff8bb..67a8659 100644
--- a/README.md
+++ b/README.md
@@ -133,6 +133,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 
 * [Ceph](http://ceph.com/) - Distributed object store and file system.
 * [DRBD](http://www.drbd.org/) - Disributed Replicated Block Device.
+* [LeoFS](http://leo-project.net) - Unstructured object/data storage and a highly available, distributed, eventually consistent storage system.
 * [GlusterFS](http://www.gluster.org/) - Scale-out network-attached storage file system.
 * [HDFS](http://hadoop.apache.org/) - Distributed, scalable, and portable file-system written in Java for the Hadoop framework.
 * [Lustre](http://lustre.opensfs.org/) -  A type of parallel distributed file system, generally used for large-scale cluster computing.
-- 
GitLab


From 189bbbf39cdae4441a9b13d24edc08c5859c7422 Mon Sep 17 00:00:00 2001
From: Davide Schiera <davide@draios.com>
Date: Thu, 26 Jun 2014 23:54:15 -0700
Subject: [PATCH 08/25] Adding Wireshark (Troubleshooting)

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 5f59337..6bdfaf1 100644
--- a/README.md
+++ b/README.md
@@ -344,6 +344,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 *Troubleshooting Tools.*
 
 * [Sysdig](http://www.sysdig.org/) - Capture system state and activity from a running Linux instance, then save, filter and analyze.
+* [Wireshark](http://www.wireshark.org/) - The world's foremost network protocol analyzer.
 
 ## Project Management
 *Web-based project management and bug tracking systems.*
-- 
GitLab


From 49d270611e7ba66d297fbdbb939d95586bd7467e Mon Sep 17 00:00:00 2001
From: Dominic Cleal <dominic@computerkb.co.uk>
Date: Fri, 27 Jun 2014 10:43:19 +0100
Subject: [PATCH 09/25] Add tito to packaging

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index f1fa58a..9d20246 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
   * [Network Configuration Management](#network-configuration-management)
   * [Newsletter](#newsletters)
   * [NoSQL](#nosql)
+  * [Packaging](#packaging)
   * [RDBMS](#rdbms)
   * [SMTP](#smtp)
   * [Software Containers](#software-containers)
@@ -280,6 +281,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [fpm](https://github.com/jordansissel/fpm) - Versatile multi format package creator.
 * [omnibus-ruby](https://github.com/opscode/omnibus-ruby) - Full stack, cross distro packaging software (Ruby).
 * [packman](http://packman.readthedocs.org) - Full stack, cross distro packaging software (Python).
+* [tito](https://github.com/dgoodwin/tito) - Builds RPMs for git-based projects.
 
 ## Queuing
 
-- 
GitLab


From e80739275ac6c4a195037a8f0e9660736eafecaa Mon Sep 17 00:00:00 2001
From: Hunter Thornsberry <hunter@hunterthornsberry.com>
Date: Fri, 27 Jun 2014 11:22:27 -0400
Subject: [PATCH 10/25] Moved "Dash" to correct topic

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 267b80c..675084a 100644
--- a/README.md
+++ b/README.md
@@ -203,6 +203,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 * [Cacti](http://www.cacti.net) - Web-based network monitoring and graphing tool.
 * [Cabot](http://cabotapp.com/) - Monitoring and alerts, similar to PagerDuty.
 * [check_mk](http://mathias-kettner.com/check_mk.html) - Collection of extensions for Nagios.
+* [Dash](https://github.com/afaqurk/linux-dash) - A low-overhead monitoring web dashboard for a GNU/Linux machine.
 * [Icinga](https://www.icinga.org/) - Fork of Nagios.
 * [LibreNMS](https://github.com/librenms/librenms/) - fork of Observium.
 * [Monit](http://mmonit.com/monit/#home) - Small Open Source utility for managing and monitoring Unix systems.
@@ -234,7 +235,6 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 * [OpenTSDB](http://opentsdb.net/) - Store and server massive amounts of time series data without losing granularity.
 * [RRDtool](http://oss.oetiker.ch/rrdtool/) - Open source industry standard, high performance data logging and graphing system for time series data.
 * [Statsd](https://github.com/etsy/statsd/) - Application statistic listener.
-* [Dash](https://github.com/afaqurk/linux-dash) - A low-overhead monitoring web dashboard for a GNU/Linux machine.
 
 ## Network Configuration Management
 *Network configuration management tools.*
-- 
GitLab


From ce06f6e599d4c7d6e9f1f0b5e5cdb75ab6cd5d3a Mon Sep 17 00:00:00 2001
From: Javier Palomo Almena <jvrplmlmn@gmail.com>
Date: Mon, 7 Jul 2014 21:38:35 +0200
Subject: [PATCH 11/25] Added Seyren to monitoring tools.

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 6381550..e87cba1 100644
--- a/README.md
+++ b/README.md
@@ -229,6 +229,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 * [Riemann](http://riemann.io/) - Flexible and fast events processor allowing complex events/metrics analysis.
 * [Sensu](http://sensuapp.org/) - Open source monitoring framework.
 * [Sentry](https://getsentry.com/) - Application monitoring, event logging and aggregation.
+* [Seyren](https://github.com/scobal/seyren) - An alerting dashboard for Graphite.
 * [Shinken](http://www.shinken-monitoring.org/) - Another monitoring framework.
 * [Thruk](http://www.thruk.org/) - Multibackend monitoring webinterface with support for Naemon, Nagios, Icinga and Shinken.
 * [Xymon](http://www.xymon.com/) - Network monitoring inspired by Big Brother.
-- 
GitLab


From cde501bc957fc1248dc8fc0d7cc6b10143827c08 Mon Sep 17 00:00:00 2001
From: sarvesh279 <sarvesh.sridharan@gmail.com>
Date: Tue, 8 Jul 2014 12:43:13 +0530
Subject: [PATCH 12/25] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 6381550..f5e73b5 100644
--- a/README.md
+++ b/README.md
@@ -332,6 +332,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 
 * [Docker](http://www.docker.com/) - Open platform for developers and sysadmins to build, ship, and run distributed applications.
 * [OpenVZ](http://openvz.org) - Container-based virtualization for Linux.
+* [Fig](http://orchardup.github.io/fig/) - Fast, isolated development environments using Docker.
 
 ## SSH
 *SSH tools.*
-- 
GitLab


From 7140fed06df40fda6c74f8fa4931d4f15b7c19ac Mon Sep 17 00:00:00 2001
From: sarvesh279 <sarvesh.sridharan@gmail.com>
Date: Tue, 8 Jul 2014 12:47:20 +0530
Subject: [PATCH 13/25] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 6381550..5f8b3c0 100644
--- a/README.md
+++ b/README.md
@@ -332,6 +332,8 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 
 * [Docker](http://www.docker.com/) - Open platform for developers and sysadmins to build, ship, and run distributed applications.
 * [OpenVZ](http://openvz.org) - Container-based virtualization for Linux.
+* [dokku](https://github.com/progrium/dokku) - Docker powered mini-Heroku in around 100 lines of Bash
+* [shipyard](https://github.com/shipyard/shipyard) - Shipyard is a web UI for http://docker.io
 
 ## SSH
 *SSH tools.*
-- 
GitLab


From bfda49376e54a22a1f2d797631f5e5b992d83978 Mon Sep 17 00:00:00 2001
From: Sergey Popov <sergeyp@ws05.local>
Date: Wed, 9 Jul 2014 14:19:38 +0300
Subject: [PATCH 14/25] Fixed typo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6381550..aeaac2c 100644
--- a/README.md
+++ b/README.md
@@ -96,7 +96,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 * [Seafile](http://seafile.com) - Another Open Source Cloud Storage solution.
 * [SparkleShare](http://sparkleshare.org/) - Provides cloud storage and file synchronization services. By default, it uses Git as a storage backend.
 * [Swift](http://docs.openstack.org/developer/swift/) - A highly available, distributed, eventually consistent object/blob store.
-* [Syncthing](http://syncthing.net/) - Open Source system for private, encrypted and authenticated distrobution of data.
+* [Syncthing](http://syncthing.net/) - Open Source system for private, encrypted and authenticated distribution of data.
 
 ## Collaborative Software
 *Collaborative software or groupware suites.*
-- 
GitLab


From a2a0058db9ff6dc67add4883678d6d2df8dda98c Mon Sep 17 00:00:00 2001
From: necrophcodr <tcg.thegamer@gmail.com>
Date: Fri, 11 Jul 2014 16:11:22 +0200
Subject: [PATCH 15/25] Update README.md

Add Version Control software: Darcs
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 6381550..1540cb3 100644
--- a/README.md
+++ b/README.md
@@ -384,6 +384,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [Fossil](http://www.fossil-scm.org/) - Distributed version control with built-in wiki and bug tracking.
 * [Git](http://git-scm.com/) - Distributed revision control and source code management (SCM) with an emphasis on speed.
 * [GNU Bazaar](http://bazaar.canonical.com/) - Distributed revision control system sponsored by Canonical.
+* [Darcs](http://darcs.net/) - Distributed version control based of patches and changes instead of snapshots.
 * [Mercurial](http://mercurial.selenic.com/) - Another distributed revision control.
 * [Subversion](http://subversion.apache.org/) - Client-server revision control system.
 
-- 
GitLab


From a4e810916b0953794a870f73816a67547386a966 Mon Sep 17 00:00:00 2001
From: Aaron Kaufman <aaron@aaronkaufman.com>
Date: Sat, 12 Jul 2014 17:31:55 -0700
Subject: [PATCH 16/25] Update README.md

Added Ossec.
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 6381550..84d3b2c 100644
--- a/README.md
+++ b/README.md
@@ -314,6 +314,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 *Security tools.*
 
 * [Fail2Ban](http://www.fail2ban.org/wiki/index.php/Main_Page) - Scans log files and takes action on IPs that show malicious behavior.
+* [Ossec](http://www.ossec.net) - Host-based Intrusion Detection System that performs log analysis, file integrity checking, policy monitoring, rootkit detection, real-time alerting and active response.
 
 ## SMTP
 *SMTP servers.*
-- 
GitLab


From 46b7ff675b355de708bf3323e0d306c01c3c9ca3 Mon Sep 17 00:00:00 2001
From: Winston Weinert <winston@ml1.net>
Date: Mon, 14 Jul 2014 20:17:39 -0500
Subject: [PATCH 17/25] Tarsnap is not actually Open Source Software

The source code is available for the sole use of the tarsnap backup service,
proper. Full license text from COPYING as follows:

Unless specified otherwise in individual files or directories, the
contents of this package is covered by the following copyright, license,
and disclaimer:

Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Colin Percival
All rights reserved.

Redistribution and use in source and binary forms, without modification,
is permitted for the sole purpose of using the "tarsnap" backup service
provided by Colin Percival.

THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6381550..dcf5714 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 * [Lsyncd](https://github.com/axkibe/lsyncd) - Watches a local directory trees for changes, and then spawns a process to synchronize the changes. Uses rsync by default.
 * [Rsnapshot](http://www.rsnapshot.org/) - Filesystem Snapshotting Utility.
 * [SafeKeep](http://safekeep.sourceforge.net/) - Centralized pull-based backup using `rdiff-backup`.
-* [TarSnap](https://www.tarsnap.com/) - Secure backup service with an open-source client.
+* [TarSnap](https://www.tarsnap.com/) - Secure backup service with a portable client in C.
 * [UrBackup](http://www.urbackup.org/) - Another client-server backup system.
 * [DREBS](https://github.com/dojo4/drebs) - AWS EBS backup script that supports strategies.
 
-- 
GitLab


From 53af7e030cbd77d2a9b967eb4b8f330f06d13be8 Mon Sep 17 00:00:00 2001
From: Javier Palomo Almena <jvrplmlmn@gmail.com>
Date: Mon, 21 Jul 2014 18:20:23 +0200
Subject: [PATCH 18/25] Added a new section "Load Testing", that includes 2
 tools, Gatling and JMeter.

---
 README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.md b/README.md
index 6381550..ebd7cc1 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
   * [IMAP/POP3](#imappop3)
   * [IT Asset Management](#it-asset-management)
   * [LDAP](#ldap)
+  * [Load Testing](#load-testing)
   * [Log Management](#log-management)
   * [Monitoring](#monitoring)
   * [Metric & Metric Collection](#metric--metric-collection)
@@ -200,6 +201,12 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 * [OpenDS](https://opends.java.net/) - Another directory server written in Java.
 * [OpenLDAP](http://openldap.org/) - Developed by the OpenLDAP Project.
 
+## Load Testing
+*Load Testing tools.*
+
+* [Apache JMeter](http://jmeter.apache.org/) - An Open Source Java desktop application for testing Web Applications.
+* [Gatling Tool](http://gatling-tool.org/) - An Open Source Stress Tool.
+
 ## Log Management
 *Log management tools: collect, parse, visualize ...*
 
-- 
GitLab


From bfc608ac475cdc19410b1eec396e96ab03c5e330 Mon Sep 17 00:00:00 2001
From: "M. Valdes" <mvaldes@mvaldes.cl>
Date: Fri, 25 Jul 2014 01:30:40 -0400
Subject: [PATCH 19/25] Added QEMU to Virtualization section

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 6381550..c3bc3da 100644
--- a/README.md
+++ b/README.md
@@ -394,6 +394,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [KVM](http://www.linux-kvm.org) - Linux kernel virtualization infrastructure.
 * [oVirt](http://www.ovirt.org/) - Manages virtual machines, storage and virtual networks.
 * [Packer](http://www.packer.io/) - A tool for creating identical machine images for multiple platforms from a single source configuration.
+* [QEMU](http://www.qemu.org/) - QEMU is a generic and open source machine emulator and virtualizer.
 * [Vagrant](https://www.vagrantup.com/) - Tool for building complete development environments.
 * [VirtualBox](https://www.virtualbox.org/) - Virtualization product from Oracle Corporation.
 * [Xen](http://www.xenproject.org/) - Virtual machine monitor for 32/64 bit Intel / AMD (IA 64) and PowerPC 970 architectures.
-- 
GitLab


From 51ec57f537ecbcaf93891148ffac0e6ec913ee07 Mon Sep 17 00:00:00 2001
From: nizq <ni.zhiqiang@gmail.com>
Date: Tue, 26 Aug 2014 09:01:16 +0800
Subject: [PATCH 20/25] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 6381550..d7569e0 100644
--- a/README.md
+++ b/README.md
@@ -407,6 +407,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [sshuttle](https://github.com/apenwarr/sshuttle) - Poor man's VPN.
 * [strongSwan](http://www.strongswan.org/) - Complete IPsec implementation for Linux.
 * [tinc](http://www.tinc-vpn.org/) - Distributed p2p VPN.
+* [SigmaVPN)(http://frozenriver.net/SigmaVPN) - SigmaVPN is simple, light-weight and modular VPN software for UNIX systems, deploying the NaCl encryption library. 
 
 ## XMPP
 *XMPP servers.*
-- 
GitLab


From 4de17822d92f6df3a378480201d358462f146aad Mon Sep 17 00:00:00 2001
From: nizq <ni.zhiqiang@gmail.com>
Date: Tue, 26 Aug 2014 09:01:57 +0800
Subject: [PATCH 21/25] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d7569e0..2fbcbfa 100644
--- a/README.md
+++ b/README.md
@@ -407,7 +407,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [sshuttle](https://github.com/apenwarr/sshuttle) - Poor man's VPN.
 * [strongSwan](http://www.strongswan.org/) - Complete IPsec implementation for Linux.
 * [tinc](http://www.tinc-vpn.org/) - Distributed p2p VPN.
-* [SigmaVPN)(http://frozenriver.net/SigmaVPN) - SigmaVPN is simple, light-weight and modular VPN software for UNIX systems, deploying the NaCl encryption library. 
+* [SigmaVPN](http://frozenriver.net/SigmaVPN) - SigmaVPN is simple, light-weight and modular VPN software for UNIX systems, deploying the NaCl encryption library. 
 
 ## XMPP
 *XMPP servers.*
-- 
GitLab


From 5a33a9054bbc66aedae5b06fa23908548c7d21c3 Mon Sep 17 00:00:00 2001
From: James Hannah <james@tlyk.eu>
Date: Tue, 2 Sep 2014 19:36:16 +0100
Subject: [PATCH 22/25] Added Archiveopteryx

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 6381550..0ce96b1 100644
--- a/README.md
+++ b/README.md
@@ -180,6 +180,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 * [Cyrus IMAP/POP3](http://cyrusimap.org/) - Intended to be run on sealed servers, where normal users are not permitted to log in.
 * [Dovecot](http://www.dovecot.org/) - IMAP and POP3 server written primarily with security in mind.
 * [Qpopper](http://www.eudora.com/products/unsupported/qpopper/) - One of the oldest and most popular server implementations of POP3.
+* [Archiveopteryx](http://archiveopteryx.org) - IMAP/POP3/LMTP server with PostgreSQL backend storage
 
 ## IT Asset Management
 *IT Assets Management software.*
-- 
GitLab


From b9f9a4bf4682bf3ae8c67601a3f4b24b908053d3 Mon Sep 17 00:00:00 2001
From: James Hannah <james@tlyk.eu>
Date: Tue, 2 Sep 2014 19:38:34 +0100
Subject: [PATCH 23/25] Fixed ordering, added trailing period

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0ce96b1..9269a20 100644
--- a/README.md
+++ b/README.md
@@ -176,11 +176,11 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 ## IMAP/POP3
 *IMAP/POP3 mail servers.*
 
+* [Archiveopteryx](http://archiveopteryx.org) - IMAP/POP3/LMTP server with PostgreSQL backend storage.
 * [Courier IMAP/POP3](http://www.courier-mta.org/imap/) - Fast, scalable, enterprise IMAP and POP3 server.
 * [Cyrus IMAP/POP3](http://cyrusimap.org/) - Intended to be run on sealed servers, where normal users are not permitted to log in.
 * [Dovecot](http://www.dovecot.org/) - IMAP and POP3 server written primarily with security in mind.
 * [Qpopper](http://www.eudora.com/products/unsupported/qpopper/) - One of the oldest and most popular server implementations of POP3.
-* [Archiveopteryx](http://archiveopteryx.org) - IMAP/POP3/LMTP server with PostgreSQL backend storage
 
 ## IT Asset Management
 *IT Assets Management software.*
-- 
GitLab


From 021449ea6389c0d97a10d52cfa78d8f54ed227cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Zawadzki?= <bluszcz@bluszcz.net>
Date: Tue, 9 Sep 2014 18:19:46 +0200
Subject: [PATCH 24/25] Added Octopussy

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 6381550..17386a4 100644
--- a/README.md
+++ b/README.md
@@ -210,6 +210,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 * [Heka](http://hekad.readthedocs.org/en/latest/) - Stream processing system which may be used for log aggregation.
 * [Kibana](http://www.elasticsearch.org/overview/kibana/) - Visualize logs and time-stamped data.
 * [Logstash](http://logstash.net/) - Tool for managing events and logs.
+* [Octopussy](http://8pussy.org/) - Open Source Log Management Solution
 
 ## Monitoring
 *Monitoring software.*
-- 
GitLab


From c8715e64ed309f433802b5949592b7e1e3c06fba Mon Sep 17 00:00:00 2001
From: blackyboy <babinlonston@live.com>
Date: Sat, 13 Sep 2014 12:55:05 +0530
Subject: [PATCH 25/25] Phabricator

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 6381550..941671e 100644
--- a/README.md
+++ b/README.md
@@ -374,6 +374,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [ChiliProject](https://www.chiliproject.org) - Fork of Redmine.
 * [GitLab](https://www.gitlab.com/) - Clone of GitHub written in ruby.
 * [Gogs](http://gogs.io/) - Written in Go.
+* [Phabricator](http://phabricator.org/) - Written in PHP
 * [Redmine](http://www.redmine.org/) - Written in ruby on rails.
 * [The Bug Genie](http://www.thebuggenie.com/) - Written in PHP.
 * [Trac](http://trac.edgewall.org/) - Written in python.
-- 
GitLab