5 Commits

Author	SHA1	Message	Date
Seth House	7b9ebf9872	Absorbed Sphinx conf.py for salt-cloud into Salt's	2013-11-08 15:08:32 -07:00
Seth House	761f794123	Absorbed the salt-cloud index.rst document	2013-11-08 15:08:30 -07:00
Seth House	783cab927b	Absorbed salt-cloud documentation contents into Salt's	2013-11-08 15:08:07 -07:00
Seth House	e4f638e6d7	Moved salt-cloud documentation into main docs dir	2013-11-08 14:08:36 -07:00
Seth House	95a38461fe	Moved all salt-cloud files into a subdirectory for move to Salt ... This is the simplest method of preserving the commit history for each file from the salt-cloud repository, although the --follow flag must be given to git log in order to view the full history. This change allows for performing a regular git merge from within the Salt repo without any merge conflicts occuring (since the salt_cloud dir doesn't exist there).	2013-11-08 11:22:10 -07:00