Commits · github/fork/bmaeser/patch-1 · Francisco Augusto / awesome-sysadmin

View open merge request

09 Sep, 2015 14 commits
- added new section: firewalls · 709b396e
  Bernhard Mäser authored 9 years ago
```
new section: firewalls and some projects. all projects are licensed under open source licenses
```
  709b396e
- Merge branch 'coodoing-master' · 91981207
  Francisco Augusto authored 9 years ago
  
  91981207
- Merge branch 'master' of https://github.com/coodoing/awesome-sysadmin into coodoing-master · 6417d5e0
  Francisco Augusto authored 9 years ago
```
Conflicts:
	README.md
```
  6417d5e0
- Merge pull request #138 from westurner/patch-1 · 120b7a17
  Francisco Augusto authored 9 years ago
```
Add Backups > Bup
```
  120b7a17
- Merge pull request #133 from Shini31/master · 5be77e81
  Francisco Augusto authored 9 years ago
```
Adding Centreon to Monitoring
```
  5be77e81
- Merge pull request #132 from yimeng/master · eb2ddb01
  Francisco Augusto authored 9 years ago
```
add zookeeper etcd serf consul
```
  eb2ddb01
- Changed ZeroMQ category and description · bfd20801
  Francisco Augusto authored 9 years ago
  
  bfd20801
- Changed FreeFileSync url and description · ec41034b
  Francisco Augusto authored 9 years ago
  
  ec41034b
- Merge pull request #115 from citydweller1985/patch-1 · cb1e68ea
  Francisco Augusto authored 9 years ago
```
Update README.md
```
  cb1e68ea
- Merge pull request #304 from suff/master · 34393c16
  Francisco Augusto authored 9 years ago
```
updated url for Vlad the Deployer
```
  34393c16
- Merge pull request #326 from iamkarlson/master · 1e0115b8
  Francisco Augusto authored 9 years ago
```
Apache Directory Studio
```
  1e0115b8
- Merge pull request #327 from scutdk/patch-1 · a9cc6929
  Francisco Augusto authored 9 years ago
```
update analog link
```
  a9cc6929
- Merge branch 'bdossantos-master' · 199add34
  Francisco Augusto authored 9 years ago
  
  199add34
- Merge branch 'master' of https://github.com/bdossantos/awesome-sysadmin into bdossantos-master · e65e2ac2
  Francisco Augusto authored 9 years ago
```
Conflicts:
	README.md
```
  e65e2ac2
06 Sep, 2015 1 commit
- update analog link · 1e3e4b1e
  Xiong Dezhi authored 9 years ago
  
  1e3e4b1e
05 Sep, 2015 1 commit
- Apache Directory Studio · 6bd3d173
  iamkarlson authored 9 years ago
  
  6bd3d173
23 Aug, 2015 1 commit
- updated url for Vlad the Deployer · 6c0ee9f0
  Maciej Stromich authored 9 years ago
  
  6c0ee9f0
10 Oct, 2014 3 commits
- Merge pull request #152 from nlake44/appscale2 · ecafca0b
  Francisco Augusto authored 10 years ago
```
Added AppScale to cloud section
```
  ecafca0b
- Merge branch 'lifepillar-openproject' · 596f99e8
  Francisco Augusto authored 10 years ago
  
  596f99e8
- Merge branch 'openproject' of https://github.com/lifepillar/awesome-sysadmin... · 3a2d7c6e
  Francisco Augusto authored 10 years ago
```
Merge branch 'openproject' of https://github.com/lifepillar/awesome-sysadmin into lifepillar-openproject

Conflicts:
	README.md
```
  3a2d7c6e
06 Oct, 2014 3 commits
- Merge pull request #141 from sebthebert/master · cc2ab283
  Francisco Augusto authored 10 years ago
```
Octopussy project added in Log Management section
```
  cc2ab283
- Merge pull request #159 from jnv/patch-1 · 6eabe219
  Francisco Augusto authored 10 years ago
```
Add Hypertable to Column-oriented NoSQL
```
  6eabe219
- Merge pull request #134 from sahilm/patch-1 · 343817e9
  Francisco Augusto authored 10 years ago
```
Emphasise that Go is a continuous delivery server.
```
  343817e9
04 Oct, 2014 9 commits
- Merge branch 'jancborchardt-patch-1' · c2e9bbf7
  Francisco Augusto authored 10 years ago
  
  c2e9bbf7
- Merge branch 'patch-1' of https://github.com/jancborchardt/awesome-sysadmin... · 2a00b73c
  Francisco Augusto authored 10 years ago
```
Merge branch 'patch-1' of https://github.com/jancborchardt/awesome-sysadmin into jancborchardt-patch-1

Conflicts:
	README.md
```
  2a00b73c
- Merge pull request #129 from TannerFilip/master · 30a89e46
  Francisco Augusto authored 10 years ago
```
add phabricator
```
  30a89e46
- Merge pull request #150 from sphoorti/master · 64845fb7
  Francisco Augusto authored 10 years ago
```
fixes #149 Added code review tools.
```
  64845fb7
- Merge pull request #128 from krondor/patch-5 · 6f9a69b4
  Francisco Augusto authored 10 years ago
```
Added SpamAssassin to Security Tools
```
  6f9a69b4
- Merge branch 'falzm-master' · 22b5ab20
  Francisco Augusto authored 10 years ago
  
  22b5ab20
- Merge branch 'master' of https://github.com/falzm/awesome-sysadmin into falzm-master · 8fb93f91
  Francisco Augusto authored 10 years ago
```
Conflicts:
	README.md
```
  8fb93f91
- Merge pull request #142 from etienne/textmate · cf33c238
  Francisco Augusto authored 10 years ago
```
Add TextMate to Editors
```
  cf33c238
- Merge pull request #139 from pew/master · f3ab5f83
  Francisco Augusto authored 10 years ago
```
Add Gollum Wiki
```
  f3ab5f83
03 Oct, 2014 8 commits
- Merge pull request #137 from tomekw/patch-1 · cd643fc5
  Francisco Augusto authored 10 years ago
```
Add Light Table to Editors
```
  cd643fc5
- Merge pull request #136 from nodiscc/patch-2 · 7d327a73
  Francisco Augusto authored 10 years ago
```
Add Mailpile to Webmails
```
  7d327a73
- Merge pull request #135 from nodiscc/patch-1 · 1121463d
  Francisco Augusto authored 10 years ago
```
Add Olelo to Wikis
```
  1121463d
- Merge pull request #131 from jbayer/master · c58325b3
  Francisco Augusto authored 10 years ago
```
Add BOSH to Cloud Orchestration
```
  c58325b3
- Merge pull request #122 from hrj/patch-1 · e53bea91
  Francisco Augusto authored 10 years ago
```
Added GitBucket
```
  e53bea91
- Merge branch 'nils-werner-master' · 53c258f3
  Francisco Augusto authored 10 years ago
  
  53c258f3
- Merge branch 'master' of https://github.com/nils-werner/awesome-sysadmin into nils-werner-master · d1439cc6
  Francisco Augusto authored 10 years ago
```
Conflicts:
	README.md
```
  d1439cc6
- Merge branch 'krondor-master' · 102c214c
  Francisco Augusto authored 10 years ago
  
  102c214c