1
0
mirror of https://github.com/rancher/os.git synced 2025-06-22 21:17:02 +00:00
Commit Graph

2 Commits

Author SHA1 Message Date
Darren Shepherd
325cbc2fe7 Merge branch 'master' of github.com:sidharthamani/os into sidharthamani-master
Conflicts:
	config/default.go
2015-02-19 11:32:09 -07:00
sidharthamani
fb237dbebe add cloud-init support 2015-02-18 19:46:22 -08:00