34ddb33b60 
								
							 
						 
						
							
							
								
								moved badges  
							
							
							
						 
						
							2015-08-03 15:48:38 +02:00  
				
					
						
							
							
								 
						
							
								03ffd0088b 
								
							 
						 
						
							
							
								
								Merge pull request  #86  from nodiscc/patch-1  
							
							... 
							
							
							
							add backup tools: obnam, rdiff-backup 
							
						 
						
							2015-08-02 17:57:06 +02:00  
				
					
						
							
							
								 
						
							
								d22594f55c 
								
							 
						 
						
							
							
								
								removed Analog ( closes   #91 )  
							
							
							
						 
						
							2015-08-01 23:56:36 +02:00  
				
					
						
							
							
								 
						
							
								7605161593 
								
							 
						 
						
							
							
								
								add awesome badge  
							
							
							
						 
						
							2015-08-01 23:53:49 +02:00  
				
					
						
							
							
								 
						
							
								c063d65675 
								
							 
						 
						
							
							
								
								use nested list instead of h3 heading to make it easier to read  
							
							
							
						 
						
							2015-07-30 22:00:43 +10:00  
				
					
						
							
							
								 
						
							
								0fcb079b4b 
								
							 
						 
						
							
							
								
								Added tcollector for OpenTSDB  
							
							
							
						 
						
							2015-07-30 21:57:55 +10:00  
				
					
						
							
							
								 
						
							
								acb537ba97 
								
							 
						 
						
							
							
								
								separated metric tools in to categories to make it neater and easier to find what you're looking for  
							
							
							
						 
						
							2015-07-30 21:57:15 +10:00  
				
					
						
							
							
								 
						
							
								3ba8696e2e 
								
							 
						 
						
							
							
								
								Remove extra space before Userspace  
							
							
							
						 
						
							2015-07-27 07:10:06 -07:00  
				
					
						
							
							
								 
						
							
								13b53a087c 
								
							 
						 
						
							
							
								
								add more backup tools: obnam, rdiff-backup  
							
							
							
						 
						
							2015-07-27 14:17:23 +02:00  
				
					
						
							
							
								 
						
							
								7f947f8e37 
								
							 
						 
						
							
							
								
								rm some old stuff from sourceforge  
							
							... 
							
							
							
							mostly I removed software which wasn't updated since 2y+ and hosted on sourceforge. Sourceforge treats FLOSS authors badly and I don't want to support this. Re-inclusion might happen if somebody still thinks the removed stuff is awesome; feel free to create a PR in this case. 
							
						 
						
							2015-07-27 11:09:06 +02:00  
				
					
						
							
							
								 
						
							
								82ac6e847b 
								
							 
						 
						
							
							
								
								Add rake link, strip trailing spaces  
							
							
							
						 
						
							2015-07-25 11:23:13 -07:00  
				
					
						
							
							
								 
						
							
								ccf4cae1e3 
								
							 
						 
						
							
							
								
								rm MySQL (another Oracle fuckup)  
							
							
							
						 
						
							2015-07-13 10:25:13 +02:00  
				
					
						
							
							
								 
						
							
								964667bf9a 
								
							 
						 
						
							
							
								
								rm sicekit (domain parked, last commit 2y ago)  
							
							
							
						 
						
							2015-07-13 10:22:50 +02:00  
				
					
						
							
							
								 
						
							
								03c2b37a6d 
								
							 
						 
						
							
							
								
								rm Mailpile (unstable beta)  
							
							
							
						 
						
							2015-07-13 10:20:23 +02:00  
				
					
						
							
							
								 
						
							
								afb8815d92 
								
							 
						 
						
							
							
								
								rm Bacula (Bareos = awesome fork)  
							
							
							
						 
						
							2015-07-10 05:47:15 +02:00  
				
					
						
							
							
								 
						
							
								ad38f37bfa 
								
							 
						 
						
							
							
								
								replaced TRK with grml (former is dead)  
							
							
							
						 
						
							2015-07-10 05:43:33 +02:00  
				
					
						
							
							
								 
						
							
								bc9575ae1f 
								
							 
						 
						
							
							
								
								corrected gitter badge  
							
							
							
						 
						
							2015-06-29 21:15:53 +02:00  
				
					
						
							
							
								 
						
							
								5e8f6e6090 
								
							 
						 
						
							
							
								
								Added Gitter badge  
							
							
							
						 
						
							2015-06-29 18:10:57 +00:00  
				
					
						
							
							
								 
						
							
								ae6e0e0b6a 
								
							 
						 
						
							
							
								
								rm environment-modules Lmod (wtf, Wikipedia link?)  
							
							
							
						 
						
							2015-06-29 18:26:09 +02:00  
				
					
						
							
							
								 
						
							
								874c6f0cfa 
								
							 
						 
						
							
							
								
								rm ZPanel (long live Sentora)  
							
							
							
						 
						
							2015-06-27 22:58:36 +02:00  
				
					
						
							
							
								 
						
							
								87898c8315 
								
							 
						 
						
							
							
								
								rm Qpopper (dead)  
							
							
							
						 
						
							2015-06-27 22:52:56 +02:00  
				
					
						
							
							
								 
						
							
								bc553d3b40 
								
							 
						 
						
							
							
								
								fix some grammar and redundancy  
							
							
							
						 
						
							2015-06-27 22:39:36 +02:00  
				
					
						
							
							
								 
						
							
								c591289872 
								
							 
						 
						
							
							
								
								rm Redo: last rel. 2012, crashes on current python2  
							
							
							
						 
						
							2015-06-27 22:38:04 +02:00  
				
					
						
							
							
								 
						
							
								d6fe740596 
								
							 
						 
						
							
							
								
								add WAPT and WPKG links  
							
							
							
						 
						
							2015-06-27 22:35:13 +02:00  
				
					
						
							
							
								 
						
							
								e913da5b73 
								
							 
						 
						
							
							
								
								remove tarsnap: no FLOSS server  
							
							
							
						 
						
							2015-06-27 22:32:22 +02:00  
				
					
						
							
							
								 
						
							
								6e4bcc3cfd 
								
							 
						 
						
							
							
								
								Add PmWiki  
							
							
							
						 
						
							2015-06-26 14:11:22 -03:00  
				
					
						
							
							
								 
						
							
								4e795721c9 
								
							 
						 
						
							
							
								
								Add WebSVN  
							
							
							
						 
						
							2015-06-25 08:48:30 -03:00  
				
					
						
							
							
								 
						
							
								c7fbcabb96 
								
							 
						 
						
							
							
								
								Add CaseBox  
							
							
							
						 
						
							2015-06-24 09:07:47 -03:00  
				
					
						
							
							
								 
						
							
								5752dfe641 
								
							 
						 
						
							
							
								
								add hMailServer  
							
							
							
						 
						
							2015-06-23 09:06:42 -03:00  
				
					
						
							
							
								 
						
							
								d4a29bce1a 
								
							 
						 
						
							
							
								
								changed 'other' link to sindresorhus' awesome  
							
							
							
						 
						
							2015-06-23 12:55:38 +02:00  
				
					
						
							
							
								 
						
							
								dff2a2d8b1 
								
							 
						 
						
							
							
								
								Fix wrong character on list  
							
							
							
						 
						
							2015-06-22 15:01:19 -03:00  
				
					
						
							
							
								 
						
							
								ce0fe4ca92 
								
							 
						 
						
							
							
								
								Add OpenVZ Web Panel  
							
							
							
						 
						
							2015-06-22 14:57:28 -03:00  
				
					
						
							
							
								 
						
							
								d763211c40 
								
							 
						 
						
							
							
								
								Another listing fixes  
							
							
							
						 
						
							2015-06-19 17:24:59 -03:00  
				
					
						
							
							
								 
						
							
								0eac454e82 
								
							 
						 
						
							
							
								
								Fix listing  
							
							... 
							
							
							
							Project Management was not present in list, then I add and fix Project Management position. 
							
						 
						
							2015-06-19 17:10:37 -03:00  
				
					
						
							
							
								 
						
							
								8aa5bdc0f2 
								
							 
						 
						
							
							
								
								Add iF.SVNAdmin  
							
							
							
						 
						
							2015-06-19 08:30:19 -03:00  
				
					
						
							
							
								 
						
							
								11fb471648 
								
							 
						 
						
							
							
								
								Add SCM-Manager  
							
							
							
						 
						
							2015-06-18 09:03:31 -03:00  
				
					
						
							
							
								 
						
							
								d6c20776da 
								
							 
						 
						
							
							
								
								Update README.md  
							
							
							
						 
						
							2015-06-17 14:37:06 -03:00  
				
					
						
							
							
								 
						
							
								95cd908cf1 
								
							 
						 
						
							
							
								
								added WPKG to 'client management'  
							
							
							
						 
						
							2015-06-17 19:06:41 +02:00  
				
					
						
							
							
								 
						
							
								7b1d3958c2 
								
							 
						 
						
							
							
								
								adding cat. 'client management' with Opsi, WAPT, OCS Inventory NG  
							
							
							
						 
						
							2015-06-17 18:57:25 +02:00  
				
					
						
							
							
								 
						
							
								593731226d 
								
							 
						 
						
							
							
								
								Fix description  
							
							
							
						 
						
							2015-06-16 10:23:01 -03:00  
				
					
						
							
							
								 
						
							
								d725864eed 
								
							 
						 
						
							
							
								
								Fix Poweradmin information  
							
							
							
						 
						
							2015-06-16 10:21:18 -03:00  
				
					
						
							
							
								 
						
							
								d4a426c798 
								
							 
						 
						
							
							
								
								Split control panels intro subgroups  
							
							
							
						 
						
							2015-06-16 10:19:30 -03:00  
				
					
						
							
							
								 
						
							
								6927259e04 
								
							 
						 
						
							
							
								
								remove redundant 'open source' text,  closes   #53  
							
							
							
						 
						
							2015-06-15 19:25:32 +02:00  
				
					
						
							
							
								 
						
							
								e2b1cc5fb6 
								
							 
						 
						
							
							
								
								Merge pull request  #22  from FGRibreau/patch-2  
							
							... 
							
							
							
							Remove bitnami which is not a Open Source software 
							
						 
						
							2015-06-15 19:15:12 +02:00  
				
					
						
							
							
								 
						
							
								50f36a13d3 
								
							 
						 
						
							
							
								
								Add Poweradmin  
							
							
							
						 
						
							2015-06-15 08:18:45 -03:00  
				
					
						
							
							
								 
						
							
								aede00866c 
								
							 
						 
						
							
							
								
								Add bazel build automation tool.  
							
							
							
						 
						
							2015-06-13 10:34:49 -07:00  
				
					
						
							
							
								 
						
							
								c7fb8d6fd4 
								
							 
						 
						
							
							
								
								Add PDNS Gui  
							
							
							
						 
						
							2015-06-12 09:12:11 -03:00  
				
					
						
							
							
								 
						
							
								7ed3f99ea4 
								
							 
						 
						
							
							
								
								Add Atomia DNS  
							
							
							
						 
						
							2015-06-11 09:17:34 -03:00  
				
					
						
							
							
								 
						
							
								81ce734e92 
								
							 
						 
						
							
							
								
								Add BandwidthD  
							
							
							
						 
						
							2015-06-10 07:55:42 -03:00  
				
					
						
							
							
								 
						
							
								8fd5f6e440 
								
							 
						 
						
							
							
								
								Add Panamax  
							
							
							
						 
						
							2015-06-09 09:19:57 -03:00  
				
					
						
							
							
								 
						
							
								48fbb27bc4 
								
							 
						 
						
							
							
								
								Add ConVirt  
							
							
							
						 
						
							2015-06-08 09:12:10 -03:00  
				
					
						
							
							
								 
						
							
								14bf0d74c4 
								
							 
						 
						
							
							
								
								Add Virtkick  
							
							... 
							
							
							
							Virtkick is vm orchestrator with panel similar to Digital Ocean, backend and frontend is open source on https://github.com/virtkick/  
							
						 
						
							2015-06-07 11:20:15 -03:00  
				
					
						
							
							
								 
						
							
								eb44e0f264 
								
							 
						 
						
							
							
								
								Add Another ServerStatus  
							
							
							
						 
						
							2015-06-05 11:08:27 -03:00  
				
					
						
							
							
								 
						
							
								31c55d059a 
								
							 
						 
						
							
							
								
								Add WebVirtMgr  
							
							
							
						 
						
							2015-06-04 10:40:19 -03:00  
				
					
						
							
							
								 
						
							
								df0a32f9bc 
								
							 
						 
						
							
							
								
								Fix LibreNMS url  
							
							
							
						 
						
							2015-06-03 11:59:26 -03:00  
				
					
						
							
							
								 
						
							
								9a8d844c06 
								
							 
						 
						
							
							
								
								Add ServerStatus and Fix LibreNMS data  
							
							
							
						 
						
							2015-06-03 08:37:13 -03:00  
				
					
						
							
							
								 
						
							
								e5aaf0ff7f 
								
							 
						 
						
							
							
								
								Add PhpSysInfo  
							
							
							
						 
						
							2015-06-02 11:35:29 -03:00  
				
					
						
							
							
								 
						
							
								ab6d61ed3e 
								
							 
						 
						
							
							
								
								Add Flynn  
							
							... 
							
							
							
							Flynn deploys apps, scales apps, and manages databases with best practices right out of the box. 
							
						 
						
							2015-06-01 09:01:33 -03:00  
				
					
						
							
							
								 
						
							
								a61d80fad3 
								
							 
						 
						
							
							
								
								Add Openshift  
							
							... 
							
							
							
							Now I will add one app per day, today is Openshift, open source enterprise PaaS powered by Red Hat 
							
						 
						
							2015-05-29 14:03:52 -03:00  
				
					
						
							
							
								 
						
							
								8e1b2f63ab 
								
							 
						 
						
							
							
								
								Update README.md  
							
							... 
							
							
							
							Add Tsuru, Tsuru is an extensible and open source Platform as a Service software 
							
						 
						
							2015-05-28 11:31:07 -03:00  
				
					
						
							
							
								 
						
							
								4e1b7dd55e 
								
							 
						 
						
							
							
								
								fixed link to pydio  
							
							
							
						 
						
							2015-05-28 16:26:21 +02:00  
				
					
						
							
							
								 
						
							
								c1f7e4ee62 
								
							 
						 
						
							
							
								
								Update README.md  
							
							... 
							
							
							
							Add Pydio, ownCloud alternative 
							
						 
						
							2015-05-28 11:21:28 -03:00  
				
					
						
							
							
								 
						
							
								dab986c5a4 
								
							 
						 
						
							
							
								
								Add a lot of applications  
							
							... 
							
							
							
							Add Horde - Webmail and groupware client
Add Rainloop - Very nice webmail with IMAP/SMTP Support and multi accounting
Add Modoboa - Modoboa is a mail hosting and management platform including a modern and simplified Web User Interface.
Add Fufix - Fufix is a mailserver installer based on Dovecot, Postfix, Postfixadmin, Nginx, PHP, MySQL and Fail2ban.
Add Stashboard - The open source status page for cloud services and APIs.
Add System Status Dashboard - SSD is a status dashboard designed to provide an easy to understand view into an organization's infrastructure health status.
Add Staytus - Staytus is a complete solution for publishing the latest information about any issues with your web applications, networks or services.
Add LibreMailer - LibreMailer is a modest and simple web based email marketing application.
Add Lewsnetter - E-mail marketing application (create and send e-mail newsletter via SES). Includes subscription management, delivery, bounce and complaint notification, templates, and some stats. 
							
						 
						
							2015-05-28 10:44:54 -03:00  
				
					
						
							
							
								 
						
							
								33476e3b5b 
								
							 
						 
						
							
							
								
								Merge pull request  #48  from phobologic/add_ssh_cert_authority  
							
							... 
							
							
							
							Add ssh-cert-authority to SSH section 
							
						 
						
							2015-05-27 18:06:01 +02:00  
				
					
						
							
							
								 
						
							
								b04e4504c3 
								
							 
						 
						
							
							
								
								Include Cracow Cloud One  
							
							... 
							
							
							
							CC1 is hosted on Github, https://github.com/cc1-cloud/cc1/  
							
						 
						
							2015-05-27 10:34:58 -03:00  
				
					
						
							
							
								 
						
							
								51fa18179d 
								
							 
						 
						
							
							
								
								Add ssh-cert-authority  
							
							
							
						 
						
							2015-05-22 22:20:52 -07:00  
				
					
						
							
							
								 
						
							
								d04462369c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'kahun/pr/162'  
							
							
							
						 
						
							2015-05-20 06:57:04 +02:00  
				
					
						
							
							
								 
						
							
								e78a02b365 
								
							 
						 
						
							
							
								
								fixed the damn Phile comment header  
							
							
							
						 
						
							2015-05-14 09:03:37 +02:00  
				
					
						
							
							
								 
						
							
								c7b8563fba 
								
							 
						 
						
							
							
								
								added comment header for inclusion in Phile CMS,  closes   #46  
							
							
							
						 
						
							2015-05-14 09:00:17 +02:00  
				
					
						
							
							
								 
						
							
								02fe4d9630 
								
							 
						 
						
							
							
								
								renamed LDAP to identity managed, restructured, added LAM+Samba  
							
							
							
						 
						
							2015-05-14 08:57:45 +02:00  
				
					
						
							
							
								 
						
							
								df9988af69 
								
							 
						 
						
							
							
								
								shorten FreeIPA description and fix link  
							
							
							
						 
						
							2015-05-13 20:58:26 -06:00  
				
					
						
							
							
								 
						
							
								a9e58411d3 
								
							 
						 
						
							
							
								
								shorten FreeIPA description  
							
							
							
						 
						
							2015-05-13 20:57:06 -06:00  
				
					
						
							
							
								 
						
							
								73adc59554 
								
							 
						 
						
							
							
								
								add FreeIPA to LDAP section  
							
							
							
						 
						
							2015-05-13 20:55:22 -06:00  
				
					
						
							
							
								 
						
							
								977cf04525 
								
							 
						 
						
							
							
								
								Add Security -> Bro  
							
							... 
							
							
							
							Bro is a powerful framework for network analysis and security monitoring. 
-> [Github Repo](https://github.com/bro/bro )
-> [Website](http://www.bro.org ) 
							
						 
						
							2015-05-06 13:19:32 +02:00  
				
					
						
							
							
								 
						
							
								45e119b2af 
								
							 
						 
						
							
							
								
								fixed link to communities category  
							
							
							
						 
						
							2015-05-05 11:38:23 +02:00  
				
					
						
							
							
								 
						
							
								380bb28785 
								
							 
						 
						
							
							
								
								linked new categories, hope that'll work  
							
							
							
						 
						
							2015-05-05 11:37:26 +02:00  
				
					
						
							
							
								 
						
							
								ac64dbf25c 
								
							 
						 
						
							
							
								
								added Resources/{Communities,Wikis}  
							
							
							
						 
						
							2015-05-05 11:34:42 +02:00  
				
					
						
							
							
								 
						
							
								5781915316 
								
							 
						 
						
							
							
								
								Add Service discovery -> etcd  
							
							... 
							
							
							
							[etcd](https://github.com/coreos/etcd ) - distributed, consistent key value store for shared configuration and service discovery 
							
						 
						
							2015-05-04 10:09:49 +02:00  
				
					
						
							
							
								 
						
							
								d7fdde520a 
								
							 
						 
						
							
							
								
								Add Linux Malware Detect (LMD)  
							
							
							
						 
						
							2015-04-14 21:08:02 -04:00  
				
					
						
							
							
								 
						
							
								0f578756a3 
								
							 
						 
						
							
							
								
								Use Web Operations Weekly's title and description  
							
							
							
						 
						
							2015-04-14 12:01:45 -04:00  
				
					
						
							
							
								 
						
							
								c247c9be1c 
								
							 
						 
						
							
							
								
								Add weekly devops newsletter resource  
							
							
							
						 
						
							2015-04-14 01:25:40 -04:00  
				
					
						
							
							
								 
						
							
								380605a5d7 
								
							 
						 
						
							
							
								
								Merge pull request  #39  from 0x70ad57001/addition-kdevelop  
							
							... 
							
							
							
							Addition KDevelop. 
							
						 
						
							2015-04-13 23:54:28 +02:00  
				
					
						
							
							
								 
						
							
								7e6362b78f 
								
							 
						 
						
							
							
								
								Merge pull request  #36  from TETYYS/master  
							
							... 
							
							
							
							Added Citadel mail server 
							
						 
						
							2015-04-13 23:54:06 +02:00  
				
					
						
							
							
								 
						
							
								3fc0697bb3 
								
							 
						 
						
							
							
								
								Merge pull request  #35  from meirwah/master  
							
							... 
							
							
							
							Add CloudSlang project 
							
						 
						
							2015-04-13 23:53:57 +02:00  
				
					
						
							
							
								 
						
							
								31eaae59a0 
								
							 
						 
						
							
							
								
								Merge pull request  #40  from xezpeleta/master  
							
							... 
							
							
							
							Add Elkarbackup 
							
						 
						
							2015-04-13 23:52:44 +02:00  
				
					
						
							
							
								 
						
							
								0548ca1814 
								
							 
						 
						
							
							
								
								Fix Elkarbackup link  
							
							
							
						 
						
							2015-04-13 20:52:14 +02:00  
				
					
						
							
							
								 
						
							
								0b797ae2f8 
								
							 
						 
						
							
							
								
								Add Elkarbackup  
							
							
							
						 
						
							2015-04-13 20:48:08 +02:00  
				
					
						
							
							
								 
						
							
								96c79fb379 
								
							 
						 
						
							
							
								
								Add KDevelop.  
							
							
							
						 
						
							2015-04-13 08:14:40 -04:00  
				
					
						
							
							
								 
						
							
								3ebcffa300 
								
							 
						 
						
							
							
								
								Adding Archipel  
							
							
							
						 
						
							2015-04-12 22:21:32 +01:00  
				
					
						
							
							
								 
						
							
								a29af5177a 
								
							 
						 
						
							
							
								
								Removing some dupes  
							
							
							
						 
						
							2015-04-12 22:20:00 +01:00  
				
					
						
							
							
								 
						
							
								dc8cacdafb 
								
							 
						 
						
							
							
								
								Cleanup  
							
							
							
						 
						
							2015-04-12 22:18:03 +01:00  
				
					
						
							
							
								 
						
							
								c668663474 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:jaxxstorm/awesome-sysadmin  
							
							... 
							
							
							
							Conflicts:
	README.md 
							
						 
						
							2015-04-12 22:15:32 +01:00  
				
					
						
							
							
								 
						
							
								4b5480345f 
								
							 
						 
						
							
							
								
								Adding packetbeat, osquery and Prometheus  
							
							
							
						 
						
							2015-04-12 22:13:45 +01:00  
				
					
						
							
							
								 
						
							
								f4dfe6b369 
								
							 
						 
						
							
							
								
								Adding some XMPP web chat clients  
							
							
							
						 
						
							2015-04-12 22:07:14 +01:00  
				
					
						
							
							
								 
						
							
								2dbb6e926c 
								
							 
						 
						
							
							
								
								Added Citadel mail server  
							
							... 
							
							
							
							Added Citadel mail server in "complete solution mail servers" category 
							
						 
						
							2015-04-12 23:04:14 +03:00  
				
					
						
							
							
								 
						
							
								38c511becb 
								
							 
						 
						
							
							
								
								Add CloudSlang project  
							
							... 
							
							
							
							Add CloudSlang project to Cloud Orchestration category 
							
						 
						
							2015-04-12 22:17:43 +03:00  
				
					
						
							
							
								 
						
							
								3d0ae07ff6 
								
							 
						 
						
							
							
								
								remove opsview (license),  closes   #34  
							
							
							
						 
						
							2015-04-10 10:58:32 +02:00  
				
					
						
							
							
								 
						
							
								7c607f5b71 
								
							 
						 
						
							
							
								
								add MDwiki  
							
							
							
						 
						
							2015-04-09 14:38:49 -04:00  
				
					
						
							
							
								 
						
							
								d9d7075ee8 
								
							 
						 
						
							
							
								
								added advanced-ssh-config (@mgarces in kahun/pr/268)  
							
							
							
						 
						
							2015-04-09 15:04:44 +02:00  
				
					
						
							
							
								 
						
							
								0ba213b218 
								
							 
						 
						
							
							
								
								Merge pull request  #30  from frdmn/master  
							
							... 
							
							
							
							Add CloudBot 
							
						 
						
							2015-04-09 14:57:11 +02:00  
				
					
						
							
							
								 
						
							
								3abf5b4f63 
								
							 
						 
						
							
							
								
								Add CC BY-SA 4.0 International license  
							
							
							
						 
						
							2015-04-09 13:05:50 +02:00  
				
					
						
							
							
								 
						
							
								e2bd1722d2 
								
							 
						 
						
							
							
								
								Add CloudBot  
							
							
							
						 
						
							2015-04-09 12:21:14 +02:00  
				
					
						
							
							
								 
						
							
								41e0847cb1 
								
							 
						 
						
							
							
								
								Merge pull request  #28  from jan0sch/fwknop  
							
							... 
							
							
							
							Add link to fwknop 
							
						 
						
							2015-04-08 18:47:07 +02:00  
				
					
						
							
							
								 
						
							
								e1eb707555 
								
							 
						 
						
							
							
								
								added Cockpit, restructured Control Panels,  closes   #27  
							
							
							
						 
						
							2015-04-08 10:23:08 +02:00  
				
					
						
							
							
								 
						
							
								9c94e9dbf4 
								
							 
						 
						
							
							
								
								Add link to `fwknop`  
							
							... 
							
							
							
							The `fwknop` tool is very useful to protect services on servers via
single packet authorization. 
							
						 
						
							2015-04-08 08:14:16 +02:00  
				
					
						
							
							
								 
						
							
								8f1cf958a9 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-patches  
							
							
							
						 
						
							2015-04-07 08:37:43 +02:00  
				
					
						
							
							
								 
						
							
								3614b028cb 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/pr/19' into merge-patches  
							
							
							
						 
						
							2015-04-07 08:35:58 +02:00  
				
					
						
							
							
								 
						
							
								5632df006d 
								
							 
						 
						
							
							
								
								Spelling Corrections  
							
							... 
							
							
							
							Spellcheck pass, correcting several mistakes.
Not touched anything debatable - hyphenation, en_US/GB, capitalization etc.. 
							
						 
						
							2015-04-06 12:26:53 -07:00  
				
					
						
							
							
								 
						
							
								2c6670150a 
								
							 
						 
						
							
							
								
								Merge pull request  #14  from awiddersheim/patch-1  
							
							... 
							
							
							
							Add OSSEC to Security 
							
						 
						
							2015-04-06 16:04:50 +02:00  
				
					
						
							
							
								 
						
							
								8ddc79545d 
								
							 
						 
						
							
							
								
								Remove bitnami which is not a Open Source software  
							
							
							
						 
						
							2015-04-06 15:05:19 +02:00  
				
					
						
							
							
								 
						
							
								7338756747 
								
							 
						 
						
							
							
								
								Remove statuspage.io,  fixes   #20  
							
							
							
						 
						
							2015-04-06 15:04:27 +02:00  
				
					
						
							
							
								 
						
							
								100b927b79 
								
							 
						 
						
							
							
								
								Shorten OSSEC description  
							
							
							
						 
						
							2015-04-06 08:52:43 -04:00  
				
					
						
							
							
								 
						
							
								72c218a043 
								
							 
						 
						
							
							
								
								Merge pull request  #18  from bliz937/master  
							
							... 
							
							
							
							Add sshrc to SSH 
							
						 
						
							2015-04-06 13:45:33 +02:00  
				
					
						
							
							
								 
						
							
								1753ee4c3a 
								
							 
						 
						
							
							
								
								Security: Updated to alphabetical  
							
							... 
							
							
							
							Relates to the following additions:
* [Glastopf](http://glastopf.org/ ) - A low-interaction web application honeypot to emulate vulnerabilities and gather attack data.
* [Kippo](https://github.com/desaster/kippo ) - A medium-interaction SSH honeypot, mostly used as a standalone SSH daemon with a configurable Filesystem sandbox. 
							
						 
						
							2015-04-06 11:57:29 +02:00  
				
					
						
							
							
								 
						
							
								8a43dd8248 
								
							 
						 
						
							
							
								
								Add Security -> Kippo  
							
							... 
							
							
							
							[Kippo](https://github.com/desaster/kippo ) is a cool sandbox, a standalone SSH daemon that can stand besides "the real" SSH daemon listening on another port, giving a sysadmin the ability to configure a whole FS sandbox. 
							
						 
						
							2015-04-06 11:36:06 +02:00  
				
					
						
							
							
								 
						
							
								a86e1ec8a7 
								
							 
						 
						
							
							
								
								Add Security -> Glastopf  
							
							... 
							
							
							
							[Glastopf](http://glastopf.org/ ) is a low interaction honeypot system which emulates vulnerabiltiies to gather data and make sense of the attacks that try to get into your system. 
							
						 
						
							2015-04-06 11:30:38 +02:00  
				
					
						
							
							
								 
						
							
								6cc6a12477 
								
							 
						 
						
							
							
								
								Merge pull request  #15  from jaseemabid/patch-1  
							
							... 
							
							
							
							Add phabricator to code review tools. 
							
						 
						
							2015-04-06 11:22:04 +02:00  
				
					
						
							
							
								 
						
							
								e439090026 
								
							 
						 
						
							
							
								
								Merge pull request  #17  from Ernest0x/patch-1  
							
							... 
							
							
							
							Add Attic to Backup software 
							
						 
						
							2015-04-06 11:12:37 +02:00  
				
					
						
							
							
								 
						
							
								f66aaaaf0a 
								
							 
						 
						
							
							
								
								created sub-categories for Repositories  
							
							
							
						 
						
							2015-04-06 11:10:03 +02:00  
				
					
						
							
							
								 
						
							
								a37db0265d 
								
							 
						 
						
							
							
								
								fixed wrong placement  
							
							
							
						 
						
							2015-04-06 10:55:19 +02:00  
				
					
						
							
							
								 
						
							
								2ee2fe13e9 
								
							 
						 
						
							
							
								
								Added sshrc  
							
							
							
						 
						
							2015-04-06 10:53:53 +02:00  
				
					
						
							
							
								 
						
							
								718589d311 
								
							 
						 
						
							
							
								
								Add Attic to Backup software  
							
							... 
							
							
							
							Attic is a deduplicating backup program written in Python. 
							
						 
						
							2015-04-06 10:17:07 +03:00  
				
					
						
							
							
								 
						
							
								3220d06f33 
								
							 
						 
						
							
							
								
								Added Repos  
							
							
							
						 
						
							2015-04-05 20:40:21 -05:00  
				
					
						
							
							
								 
						
							
								c03fc90838 
								
							 
						 
						
							
							
								
								Add phabricator to code review tools.  
							
							
							
						 
						
							2015-04-06 06:19:13 +05:30  
				
					
						
							
							
								 
						
							
								02e5e3410f 
								
							 
						 
						
							
							
								
								Add OSSEC  
							
							... 
							
							
							
							OSSEC is an Open Source Host-based Intrusion Detection System that performs log analysis, file integrity checking, policy monitoring, rootkit detection, real-time alerting and active response. 
							
						 
						
							2015-04-05 20:44:57 -04:00  
				
					
						
							
							
								 
						
							
								09cdb40063 
								
							 
						 
						
							
							
								
								added Snebu to Backup -  closes   #5  
							
							
							
						 
						
							2015-04-05 20:34:33 +02:00  
				
					
						
							
							
								 
						
							
								ceffae4ff8 
								
							 
						 
						
							
							
								
								removed Opsmatic (not FLOSS)  
							
							
							
						 
						
							2015-04-05 16:30:17 +02:00  
				
					
						
							
							
								 
						
							
								9417a3b9d5 
								
							 
						 
						
							
							
								
								merged kahun/pr/153  
							
							
							
						 
						
							2015-04-05 16:26:28 +02:00  
				
					
						
							
							
								 
						
							
								8bd42685f3 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'kahun/pr/263' into merge-patches  
							
							
							
						 
						
							2015-04-05 16:21:00 +02:00  
				
					
						
							
							
								 
						
							
								00176a7cef 
								
							 
						 
						
							
							
								
								Merge pull request  #12  from adrianblynch/patch-1  
							
							... 
							
							
							
							Link update for LevelDB in NoSQL 
							
						 
						
							2015-04-05 14:15:13 +02:00  
				
					
						
							
							
								 
						
							
								c92191b671 
								
							 
						 
						
							
							
								
								merged master  
							
							
							
						 
						
							2015-04-05 14:09:01 +02:00  
				
					
						
							
							
								 
						
							
								ab6d565a13 
								
							 
						 
						
							
							
								
								shortened descriptions in Ticketing systems  
							
							
							
						 
						
							2015-04-05 14:05:12 +02:00  
				
					
						
							
							
								 
						
							
								ead1256ba5 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:n1trux/awesome-sysadmin  
							
							
							
						 
						
							2015-04-05 14:00:43 +02:00  
				
					
						
							
							
								 
						
							
								16f659874a 
								
							 
						 
						
							
							
								
								added OWA to and shortened descriptions in Statistics  
							
							
							
						 
						
							2015-04-05 14:00:25 +02:00  
				
					
						
							
							
								 
						
							
								5d3ef3f29b 
								
							 
						 
						
							
							
								
								Link update  
							
							
							
						 
						
							2015-04-05 12:20:47 +01:00  
				
					
						
							
							
								 
						
							
								af8a7f7184 
								
							 
						 
						
							
							
								
								Adding lazlo to ChatOps category  
							
							
							
						 
						
							2015-04-04 22:33:15 -07:00  
				
					
						
							
							
								 
						
							
								23347591fd 
								
							 
						 
						
							
							
								
								New category - ChatOps  
							
							
							
						 
						
							2015-04-04 22:30:49 -07:00  
				
					
						
							
							
								 
						
							
								5d9b8d5f0e 
								
							 
						 
						
							
							
								
								Add Apache Kafka  
							
							
							
						 
						
							2015-04-04 17:10:23 -06:00  
				
					
						
							
							
								 
						
							
								adfaebbc22 
								
							 
						 
						
							
							
								
								merging from @falzm  
							
							
							
						 
						
							2015-04-04 18:20:28 +02:00  
				
					
						
							
							
								 
						
							
								5f321294d7 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:n1trux/awesome-sysadmin  
							
							
							
						 
						
							2015-04-04 12:54:12 +02:00  
				
					
						
							
							
								 
						
							
								109666e8e0 
								
							 
						 
						
							
							
								
								linked to n1trux/awesome-awesomeness in the introduction  
							
							
							
						 
						
							2015-04-04 12:32:18 +02:00  
				
					
						
							
							
								 
						
							
								54aaece303 
								
							 
						 
						
							
							
								
								Revert "tried out relative link to awesome-awesomeness"  
							
							... 
							
							
							
							This reverts commit 9afb210010 
							
						 
						
							2015-04-04 12:30:40 +02:00  
				
					
						
							
							
								 
						
							
								9afb210010 
								
							 
						 
						
							
							
								
								tried out relative link to awesome-awesomeness  
							
							
							
						 
						
							2015-04-04 12:29:36 +02:00  
				
					
						
							
							
								 
						
							
								2c3b829486 
								
							 
						 
						
							
							
								
								Changed Freeboard category  
							
							
							
						 
						
							2015-04-04 01:47:30 -07:00  
				
					
						
							
							
								 
						
							
								e6b5d4d7e3 
								
							 
						 
						
							
							
								
								Add freeboard to Monitoring  
							
							... 
							
							
							
							This is a great data viewer that's originally intended to easily display sensor data from IoT devices, but we have been using this in-house for a while to show disparate JSON data and it has been a joy to use. 
Check out the demos at http://freeboard.io/  and see for yourself! 
							
						 
						
							2015-04-04 01:43:14 -07:00  
				
					
						
							
							
								 
						
							
								b8476c49f5 
								
							 
						 
						
							
							
								
								added Froxlor, Sentora, Webmin to Hosting Control Panels  
							
							
							
						 
						
							2015-04-04 08:50:01 +02:00  
				
					
						
							
							
								 
						
							
								87a8986a8d 
								
							 
						 
						
							
							
								
								added LXC (suggestion from @vermaden)  
							
							
							
						 
						
							2015-04-04 08:45:19 +02:00  
				
					
						
							
							
								 
						
							
								4256df65c3 
								
							 
						 
						
							
							
								
								added pfSense firewall to 'Security'  
							
							
							
						 
						
							2015-04-04 06:42:58 +02:00  
				
					
						
							
							
								 
						
							
								d36c1e94e3 
								
							 
						 
						
							
							
								
								added AlternativeTo to 'Software Repositories', moved 'Editors' to the list at the top  
							
							
							
						 
						
							2015-04-04 06:26:07 +02:00  
				
					
						
							
							
								 
						
							
								339b92a7d7 
								
							 
						 
						
							
							
								
								restructured IMAP/POP/SMTP into new category 'Mail Servers' and added 'Mail Clients'  
							
							
							
						 
						
							2015-04-04 06:22:31 +02:00  
				
					
						
							
							
								 
						
							
								6b288e2f21 
								
							 
						 
						
							
							
								
								removed 'please' from contribution guidelines  
							
							
							
						 
						
							2015-04-04 06:00:06 +02:00  
				
					
						
							
							
								 
						
							
								0a35489bbb 
								
							 
						 
						
							
							
								
								added stormssh to SSH as suggested by @mmonotone  
							
							
							
						 
						
							2015-04-04 05:38:21 +02:00  
				
					
						
							
							
								 
						
							
								f9e53ff5d8 
								
							 
						 
						
							
							
								
								added QEMU to Virtualization as suggested by @mrvaldes  
							
							
							
						 
						
							2015-04-04 05:24:00 +02:00  
				
					
						
							
							
								 
						
							
								93a8af644d 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/hit9/awesome-sysadmin  into merge-patches  
							
							
							
						 
						
							2015-04-04 05:19:58 +02:00  
				
					
						
							
							
								 
						
							
								f8481d703f 
								
							 
						 
						
							
							
								
								added Opsmatic as suggested by @iweizman  
							
							
							
						 
						
							2015-04-04 05:18:45 +02:00  
				
					
						
							
							
								 
						
							
								121ca8ad58 
								
							 
						 
						
							
							
								
								Merge branch 'patch-1' of  https://github.com/saintak/awesome-sysadmin  into merge-patches  
							
							
							
						 
						
							2015-04-04 05:15:24 +02:00  
				
					
						
							
							
								 
						
							
								500d2bcc3c 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/jcherqui/awesome-sysadmin  into merge-patches  
							
							
							
						 
						
							2015-04-04 05:14:32 +02:00  
				
					
						
							
							
								 
						
							
								292258eb75 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/ignaciom/awesome-sysadmin  into merge-patches  
							
							
							
						 
						
							2015-04-04 05:13:53 +02:00  
				
					
						
							
							
								 
						
							
								a0836d0d23 
								
							 
						 
						
							
							
								
								Merge branch 'patch-1' of  https://github.com/tommodore/awesome-sysadmin  into merge-patches  
							
							
							
						 
						
							2015-04-04 05:11:25 +02:00  
				
					
						
							
							
								 
						
							
								313ab19589 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/unixorn/awesome-sysadmin  into merge-patches  
							
							
							
						 
						
							2015-04-04 05:09:10 +02:00  
				
					
						
							
							
								 
						
							
								48fe9bc524 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/daniviga/awesome-sysadmin  into merge-patches  
							
							
							
						 
						
							2015-04-04 05:08:30 +02:00  
				
					
						
							
							
								 
						
							
								c676f4e45e 
								
							 
						 
						
							
							
								
								Merge branch 'patch-1' of  https://github.com/jfryman/awesome-sysadmin  into merge-patches  
							
							
							
						 
						
							2015-04-04 05:07:04 +02:00  
				
					
						
							
							
								 
						
							
								5afc0ec882 
								
							 
						 
						
							
							
								
								Merge branch 'patch-1' of  https://github.com/sts/awesome-sysadmin  into merge-patches  
							
							
							
						 
						
							2015-04-04 05:04:31 +02:00  
				
					
						
							
							
								 
						
							
								adaeefc0a1 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/sts/awesome-sysadmin  into merge-patches  
							
							
							
						 
						
							2015-04-04 05:03:28 +02:00  
				
					
						
							
							
								 
						
							
								f25d284b98 
								
							 
						 
						
							
							
								
								Added trigger for network config management  
							
							
							
						 
						
							2015-04-04 04:58:34 +02:00  
				
					
						
							
							
								 
						
							
								ec203fa925 
								
							 
						 
						
							
							
								
								fix TOC  
							
							
							
						 
						
							2015-04-04 04:58:34 +02:00  
				
					
						
							
							
								 
						
							
								4bdfce1d7f 
								
							 
						 
						
							
							
								
								added status pages section  
							
							
							
						 
						
							2015-04-04 04:58:34 +02:00  
				
					
						
							
							
								 
						
							
								7ef8b18168 
								
							 
						 
						
							
							
								
								Add Prometheus  
							
							... 
							
							
							
							An open-source service monitoring system and time series database 
							
						 
						
							2015-04-04 04:58:33 +02:00  
				
					
						
							
							
								 
						
							
								f188451823 
								
							 
						 
						
							
							
								
								fixed typo in Webmails/Squirrelmail  
							
							
							
						 
						
							2015-04-04 04:58:33 +02:00  
				
					
						
							
							
								 
						
							
								34b7964932 
								
							 
						 
						
							
							
								
								New app in WebMail category  
							
							... 
							
							
							
							I've added SquirellMail web-based IMAP client. 
							
						 
						
							2015-04-04 04:58:33 +02:00  
				
					
						
							
							
								 
						
							
								51e60c1bca 
								
							 
						 
						
							
							
								
								Update to Automation category  
							
							... 
							
							
							
							Improved links and sorted list. 
							
						 
						
							2015-04-04 04:58:33 +02:00  
				
					
						
							
							
								 
						
							
								864310f974 
								
							 
						 
						
							
							
								
								New category - Automation  
							
							... 
							
							
							
							I've added new category - automation and added 4 open source automation build tools. Some of them are should be know by sysadmins. 
							
						 
						
							2015-04-04 04:58:33 +02:00  
				
					
						
							
							
								 
						
							
								33136ba527 
								
							 
						 
						
							
							
								
								added category: Build and software organization tools  
							
							... 
							
							
							
							Hi, this is heavy-handed in favor of things that relate to HPC, however there is no reason for not adding more bits there (such as autotools, cmake and the like) 
							
						 
						
							2015-03-30 12:43:29 +01:00  
				
					
						
							
							
								 
						
							
								87d38d4c35 
								
							 
						 
						
							
							
								
								adding Taiga.io  
							
							
							
						 
						
							2014-12-23 09:50:37 +01:00  
				
					
						
							
							
								 
						
							
								5c3e761f85 
								
							 
						 
						
							
							
								
								New Category: Deployment Automation  
							
							... 
							
							
							
							Includes: Capistrano, Fabric, Mina, Rocketeer, Vlad the Deployer 
							
						 
						
							2014-12-22 06:39:06 +01:00  
				
					
						
							
							
								 
						
							
								d3150d9c78 
								
							 
						 
						
							
							
								
								Adding Capistrano and Mina to CI tools  
							
							
							
						 
						
							2014-12-21 11:47:14 +01:00  
				
					
						
							
							
								 
						
							
								83a7d18c02 
								
							 
						 
						
							
							
								
								Adding two takes on the CMDB: Collins and Sizekit.  
							
							
							
						 
						
							2014-12-21 02:32:48 +01:00  
				
					
						
							
							
								 
						
							
								fa377a179d 
								
							 
						 
						
							
							
								
								Adding Oxidized  
							
							... 
							
							
							
							Adding Oxidized a network configuration management tool. 
							
						 
						
							2014-12-21 02:27:00 +01:00  
				
					
						
							
							
								 
						
							
								1106b7dab2 
								
							 
						 
						
							
							
								
								Added ZBackup  
							
							
							
						 
						
							2014-12-03 14:50:38 +01:00  
				
					
						
							
							
								 
						
							
								0b2656946f 
								
							 
						 
						
							
							
								
								Add blackbox reference  
							
							
							
						 
						
							2014-11-25 17:52:33 -08:00  
				
					
						
							
							
								 
						
							
								e07bcefde7 
								
							 
						 
						
							
							
								
								Add StackStorm  
							
							... 
							
							
							
							This pull adds StackStorm (http://www.stackstorm.com ) to the list of cloud orchestration tools. This tool ingests events from different tools in an environment and triggers additional actions/workflows based on the user configuration. In addition, actions can be run arbitrary using ChatOps, adding additional context around operations management into the same human conversation happening in a Chat Room.
Thank you for your consideration. 
							
						 
						
							2014-11-20 12:44:37 -06:00  
				
					
						
							
							
								 
						
							
								fa93c756f3 
								
							 
						 
						
							
							
								
								Add Bareos Backup Info  
							
							
							
						 
						
							2014-11-12 10:54:22 +01:00  
				
					
						
							
							
								 
						
							
								095ac863fc 
								
							 
						 
						
							
							
								
								adding snort to security list  
							
							
							
						 
						
							2014-11-11 10:50:33 -03:00  
				
					
						
							
							
								 
						
							
								a83c312ecc 
								
							 
						 
						
							
							
								
								Add Mail-in-a-Box  
							
							
							
						 
						
							2014-10-28 11:17:34 +01:00  
				
					
						
							
							
								 
						
							
								38dfb4506e 
								
							 
						 
						
							
							
								
								Update README.md  
							
							... 
							
							
							
							add a Analytics software ---awstats 
							
						 
						
							2014-10-28 10:33:14 +08:00  
				
					
						
							
							
								 
						
							
								821e5978dc 
								
							 
						 
						
							
							
								
								add node-bell to monitor  
							
							
							
						 
						
							2014-10-15 22:53:49 +08:00  
				
					
						
							
							
								 
						
							
								ecafca0b93 
								
							 
						 
						
							
							
								
								Merge pull request  #152  from nlake44/appscale2  
							
							... 
							
							
							
							Added AppScale to cloud section 
							
						 
						
							2014-10-10 18:48:16 +02:00  
				
					
						
							
							
								 
						
							
								3a2d7c6eec 
								
							 
						 
						
							
							
								
								Merge branch 'openproject' of  https://github.com/lifepillar/awesome-sysadmin  into lifepillar-openproject  
							
							... 
							
							
							
							Conflicts:
	README.md 
							
						 
						
							2014-10-10 18:46:58 +02:00  
				
					
						
							
							
								 
						
							
								cbd5ffc4fb 
								
							 
						 
						
							
							
								
								Add LXC to Software Containers  
							
							
							
						 
						
							2014-10-07 09:23:45 +02:00  
				
					
						
							
							
								 
						
							
								f5b2e489d5 
								
							 
						 
						
							
							
								
								Add Facette to Metrics & Metric Collection  
							
							
							
						 
						
							2014-10-07 09:21:30 +02:00  
				
					
						
							
							
								 
						
							
								eb4b2b99cb 
								
							 
						 
						
							
							
								
								Improve Salt description.  
							
							
							
						 
						
							2014-10-07 09:17:00 +02:00  
				
					
						
							
							
								 
						
							
								5e19c2f23d 
								
							 
						 
						
							
							
								
								Improve Gogs description.  
							
							
							
						 
						
							2014-10-07 09:15:29 +02:00  
				
					
						
							
							
								 
						
							
								a59ee9c70f 
								
							 
						 
						
							
							
								
								Add Brebis in Backups  
							
							
							
						 
						
							2014-10-07 09:10:01 +02:00  
				
					
						
							
							
								 
						
							
								cc2ab2836c 
								
							 
						 
						
							
							
								
								Merge pull request  #141  from sebthebert/master  
							
							... 
							
							
							
							Octopussy project added in Log Management section 
							
						 
						
							2014-10-06 11:50:36 +02:00  
				
					
						
							
							
								 
						
							
								6eabe2196e 
								
							 
						 
						
							
							
								
								Merge pull request  #159  from jnv/patch-1  
							
							... 
							
							
							
							Add Hypertable to Column-oriented NoSQL 
							
						 
						
							2014-10-06 11:50:06 +02:00  
				
					
						
							
							
								 
						
							
								343817e961 
								
							 
						 
						
							
							
								
								Merge pull request  #134  from sahilm/patch-1  
							
							... 
							
							
							
							Emphasise that Go is a continuous delivery server. 
							
						 
						
							2014-10-06 11:48:50 +02:00  
				
					
						
							
							
								 
						
							
								2a00b73cf2 
								
							 
						 
						
							
							
								
								Merge branch 'patch-1' of  https://github.com/jancborchardt/awesome-sysadmin  into jancborchardt-patch-1  
							
							... 
							
							
							
							Conflicts:
	README.md 
							
						 
						
							2014-10-04 02:28:25 +02:00  
				
					
						
							
							
								 
						
							
								30a89e46dc 
								
							 
						 
						
							
							
								
								Merge pull request  #129  from TannerFilip/master  
							
							... 
							
							
							
							add phabricator 
							
						 
						
							2014-10-04 02:13:18 +02:00  
				
					
						
							
							
								 
						
							
								64845fb7bf 
								
							 
						 
						
							
							
								
								Merge pull request  #150  from sphoorti/master  
							
							... 
							
							
							
							fixes  #149  Added code review tools. 
						
							2014-10-04 02:12:26 +02:00  
				
					
						
							
							
								 
						
							
								6f9a69b4f4 
								
							 
						 
						
							
							
								
								Merge pull request  #128  from krondor/patch-5  
							
							... 
							
							
							
							Added SpamAssassin to Security Tools 
							
						 
						
							2014-10-04 02:10:44 +02:00