Alex Polvi 31596f8d84 Merge branch 'rackspace' of https://github.com/polvi/coreos-overlay into rackspace
Conflicts:
	coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild
	coreos-base/nova-agent-watcher/nova-agent-watcher-9999.ebuild
	coreos-base/oem-rackspace/files/run
2014-03-13 10:04:22 -07:00
..