Merge branch 'master' of https://github.com/nils-werner/awesome-sysadmin into nils-werner-master

Conflicts:
	README.md
This commit is contained in:
Francisco Augusto 2014-10-04 01:47:35 +02:00
commit d1439cc627

View File

@ -136,11 +136,11 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
*Continuous integration/deployment software.* *Continuous integration/deployment software.*
* [Buildbot](http://buildbot.net/) - Python-based toolkit for continuous integration. * [Buildbot](http://buildbot.net/) - Python-based toolkit for continuous integration.
* [Drone](https://github.com/drone/drone) - Continuous integration server built on Docker and configured using YAML files.
* [GitLab CI](https://www.gitlab.com/gitlab-ci/) - Based off of ruby. They also provide GitLab, which manages git repositories. * [GitLab CI](https://www.gitlab.com/gitlab-ci/) - Based off of ruby. They also provide GitLab, which manages git repositories.
* [Go](http://www.go.cd/) - Open source agile build and release management software. * [Go](http://www.go.cd/) - Open source agile build and release management software.
* [Jenkins](http://jenkins-ci.org/) - An extendable open source continuous integration server. * [Jenkins](http://jenkins-ci.org/) - An extendable open source continuous integration server.
* [Vlad the Deployer](http://rubyhitsquad.com/Vlad_the_Deployer.html) - Deployment automation. * [Vlad the Deployer](http://rubyhitsquad.com/Vlad_the_Deployer.html) - Deployment automation.
* [Drone](https://github.com/drone/drone) - It's written in Go, and based on Docker.
## Distributed Filesystems ## Distributed Filesystems
*Network distributed filesystems.* *Network distributed filesystems.*