From 4c37677597bd2bb6c0efdaa9cc3a9f1f0b66dfe6 Mon Sep 17 00:00:00 2001 From: Fred Kelly Date: Thu, 26 Jun 2014 16:56:55 -0700 Subject: [PATCH 1/2] 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. From bb3e05a193b1d171b15d459e1c695bbc609ca7fa Mon Sep 17 00:00:00 2001 From: Francisco Augusto Date: Sat, 4 Oct 2014 01:33:54 +0200 Subject: [PATCH 2/2] Merge pull request #106 from Bitnami:master --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 49f9a53..9c07a89 100644 --- a/README.md +++ b/README.md @@ -338,6 +338,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v ## Software Containers *Operating system–level virtualization.* +* [Bitnami](https://bitnami.com/) - Produces open source installers or software packages for web applications and development stacks as well as virtual appliances. * [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. @@ -398,7 +399,6 @@ 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.