resolved LXC conflict because of non-atomic commit
This commit is contained in:
		
						commit
						073f3d559b
					
				
					 1 changed files with 1 additions and 0 deletions
				
			
		|  | @ -622,6 +622,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v | ||||||
| * [Ganeti](https://code.google.com/p/ganeti/) - Cluster virtual server management software tool built on top of KVM and Xen. | * [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. | * [KVM](http://www.linux-kvm.org) - Linux kernel virtualization infrastructure. | ||||||
| * [OpenNebula](http://opennebula.org/) - Flexible enterprise cloud made simple. | * [OpenNebula](http://opennebula.org/) - Flexible enterprise cloud made simple. | ||||||
|  | * [OpenNode](http://opennodecloud.com) - Builds open-source infrastructure management software and implements cloud systems. | ||||||
| * [oVirt](http://www.ovirt.org/) - Manages virtual machines, storage and virtual networks. | * [oVirt](http://www.ovirt.org/) - Manages virtual machines, storage and virtual networks. | ||||||
| * [Packer](http://www.packer.io/) - A tool for creating identical machine images for multiple platforms from a single source configuration. | * [Packer](http://www.packer.io/) - A tool for creating identical machine images for multiple platforms from a single source configuration. | ||||||
| * [Proxmox VE](https://www.proxmox.com/proxmox-ve) - Virtualization management solution. | * [Proxmox VE](https://www.proxmox.com/proxmox-ve) - Virtualization management solution. | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue
	
	 phre4k
						phre4k