Commit Graph

136 Commits

Author SHA1 Message Date
Francisco Augusto
2997e9da73 Merge branch 'nicwaller-patch-1' 2014-05-27 11:01:19 +02:00
Francisco Augusto
d4051c77aa Merge branch 'patch-1' of https://github.com/nicwaller/awesome-sysadmin into nicwaller-patch-1
Conflicts:
	README.md
2014-05-27 11:00:49 +02:00
Francisco Augusto
2172917240 Merge branch 'cericoda-master' 2014-05-27 10:58:07 +02:00
Francisco Augusto
1cbc17f117 Merge branch 'master' of https://github.com/cericoda/awesome-sysadmin into cericoda-master
Conflicts:
	README.md
2014-05-27 10:57:48 +02:00
Francisco Augusto
e787e7d9aa Merge branch 'ptman-patch-1' 2014-05-27 10:55:51 +02:00
Francisco Augusto
d43597e947 Merge branch 'patch-1' of https://github.com/ptman/awesome-sysadmin into ptman-patch-1
Conflicts:
	README.md
2014-05-27 10:55:17 +02:00
Francisco Augusto
455722d23c Add TiddlyWiki to Wikis 2014-05-27 10:48:29 +02:00
Francisco Augusto
4dcbeeaef0 Move Flyspray to Ticketing systems 2014-05-26 12:52:45 +02:00
Francisco Augusto
54b67a97c3 Merge pull request #19 from ptman/patch-6
Added oVirt to Virtualization
2014-05-26 12:49:18 +02:00
Francisco Augusto
4a96e63598 Merge pull request #18 from ptman/patch-5
Added ganeti to virtualization
2014-05-26 12:48:56 +02:00
Francisco Augusto
7619d67b25 Merge pull request #13 from skx/master
Added Slaughter - the perl-based configuration management tool.
2014-05-26 12:48:33 +02:00
Francisco Augusto
dce690ff8f Merge pull request #15 from ptman/patch-2
Add git-annex assistant to cloud storage
2014-05-26 12:47:57 +02:00
Francisco Augusto
db12a945a0 Merge pull request #7 from jimmypw/drbd
DRBD
2014-05-26 12:46:28 +02:00
Francisco Augusto
8f75d9f183 Merge pull request #22 from checkcheckzz/master
fix a typo
2014-05-26 12:42:47 +02:00
Francisco Augusto
b2288383a5 Merge pull request #1 from sarciszewski:patch-1 2014-05-26 12:36:14 +02:00
Zach
b4cc864e73 fix a typo 2014-05-25 16:40:22 -07:00
Francisco Augusto
1cae6487e8 Merge branch 'Ferritt1975-master' 2014-05-25 22:37:36 +02:00
Francisco Augusto
403eb449b1 Merge pull request #5 from Ferritt1975:master 2014-05-25 22:36:38 +02:00
Francisco Augusto
8928e8494a Merge pull request #3 from nathanthorpe/patch-1 2014-05-25 22:32:34 +02:00
Francisco Augusto
3224f04bb2 Merge pull request #3 from nathanthorpe/patch-1 2014-05-25 22:28:45 +02:00
Francisco Augusto
7a50e0fad3 Merge pull request #12 from drybjed/tinc
Add tinc
2014-05-25 22:05:58 +02:00
Francisco Augusto
745fc251a8 Merge pull request #8 from jimmypw/rsnapshot
rsnapshot
2014-05-25 22:05:26 +02:00
Francisco Augusto
4475f1864f Merge pull request #10 from drybjed/librenms
Add LibreNMS
2014-05-25 22:05:01 +02:00
Francisco Augusto
5ec21b6b87 Merge pull request #11 from drybjed/safekeep
Add SafeKeep
2014-05-25 22:04:16 +02:00
Francisco Augusto
96764f4147 Merge pull request #2 from usefulz/patch-1
Update README.md
2014-05-25 22:03:10 +02:00
Francisco Augusto
42c957f666 Merge pull request #16 from ptman/patch-3
Add Firebird to RDBMS
2014-05-25 22:01:47 +02:00
Francisco Augusto
be312be5bc Merge pull request #17 from ptman/patch-4
Added Mosh to SSH
2014-05-25 22:01:34 +02:00
Francisco Augusto
62b28a499f Merge pull request #20 from ptman/patch-7
Added sshuttle to VPN
2014-05-25 22:01:03 +02:00
Francisco Augusto
0902729d49 Merge pull request #21 from ptman/patch-8
Added ikiwiki to wikis
2014-05-25 21:59:41 +02:00
Paul Tötterman
76e7b7ec82 Added ikiwiki to wikis 2014-05-25 19:08:59 +03:00
Paul Tötterman
c2d79f1f30 Added sshuttle to VPN
One could argue that it belongs under SSH.
2014-05-25 19:08:12 +03:00
Paul Tötterman
931a81519f Added oVirt to Virtualization 2014-05-25 19:07:21 +03:00
Paul Tötterman
2d4804c09a Added ganeti to virtualization 2014-05-25 19:06:33 +03:00
Paul Tötterman
62f6df4403 Added Mosh to SSH 2014-05-25 19:05:43 +03:00
Paul Tötterman
e872fba047 Add Firebird to RDBMS 2014-05-25 19:04:27 +03:00
Paul Tötterman
487be4d997 Add git-annex assistant to cloud storage 2014-05-25 19:03:46 +03:00
Paul Tötterman
9434b1ee06 Add BURP to Backup 2014-05-25 19:01:28 +03:00
Steve Kemp
2d4a4b70f9 Added Slaughter. 2014-05-24 22:33:20 +01:00
Maciej Delmanowski
aa72521d3d Add tinc 2014-05-24 22:46:23 +02:00
Maciej Delmanowski
77a7e7f4b9 Add SafeKeep 2014-05-24 22:41:30 +02:00
Maciej Delmanowski
58e21aeba3 Add LibreNMS 2014-05-24 22:35:25 +02:00
Francisco Augusto
bff1954254 Added check_mk to Monitoring software 2014-05-24 20:33:49 +02:00
Francisco Augusto
3e97e02605 Added Shinken to Monitoring software 2014-05-24 20:29:13 +02:00
Francisco Augusto
cf661986f5 Added Thruk to Monitoring software 2014-05-24 20:27:16 +02:00
Francisco Augusto
80b893b927 Added Sensu to Monitoring software 2014-05-24 20:23:19 +02:00
Francisco Augusto
f842a6651b Added Naemon to Monitoring software 2014-05-24 20:22:17 +02:00
Francisco Augusto
3ead0b80d4 Added SoftEther to VPN Servers 2014-05-24 20:17:08 +02:00
Francisco Augusto
8fa60020a8 Added Eclipse to Editors 2014-05-24 20:09:51 +02:00
Francisco Augusto
33bb67bd2d Added OpenDJ to LDAP Servers 2014-05-24 20:07:58 +02:00
cericoda
9ca25005b9 Update README.md 2014-05-24 17:56:18 +01:00