Commit Graph

21 Commits

Author SHA1 Message Date
Pedro Algarvio
8a1ba0aa05 Cleaned up the remaining of salt-cloud's test suite. Closes #8886. 2013-11-28 18:02:46 +00:00
Pedro Algarvio
660a91d1ea Merge the salt-cloud cli integration tests into salt's test suite. Refs #8886. 2013-11-28 17:55:58 +00:00
Pedro Algarvio
4a08f332af Move and update the cloud configuration unit tests. 2013-11-28 11:02:23 +00:00
Joseph Hall
827ba113ef Fixing up salt-cloud sample configs 2013-11-20 08:48:01 -07:00
Pedro Algarvio
04cf54fd9d One less file in salt_cloud 2013-11-14 18:24:00 +00:00
Thomas S Hatch
db5340e502 Merge pull request #8360 from whiteinge/salt-cloud-docs-merge
Salt cloud docs merge
2013-11-08 14:22:46 -08:00
Seth House
05a170f0d0 Removed duplicate/empty salt-cloud docs files 2013-11-08 15:08:32 -07:00
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
Thomas S Hatch
6205902600 Merge pull request #8359 from techhat/saltcloud
Move saltcloud codebase into salt.cloud
2013-11-08 13:45:10 -08:00
Joseph Hall
36dc43493a Move saltcloud codebase into salt.cloud 2013-11-08 14:37:23 -07:00
Thomas S Hatch
99bbf9ea9a Merge pull request #8358 from techhat/saltcloud
Moving salt-cloud script into proper location
2013-11-08 13:14:25 -08:00
Seth House
e4f638e6d7 Moved salt-cloud documentation into main docs dir 2013-11-08 14:08:36 -07:00
Joseph Hall
9f3fcfe64f Moving salt-cloud script into proper location 2013-11-08 14:08:34 -07:00
Thomas S Hatch
3ea0d77574 Merge salt-cloud requirements.txt 2013-11-08 14:06:15 -07:00
Thomas S Hatch
51efce6575 README is no longer material 2013-11-08 14:03:43 -07:00
Thomas S Hatch
4e93e6775d License is redundant, same apache 2.0 2013-11-08 14:02:40 -07:00
Thomas S Hatch
991c151cc2 Merge salt cloud authors files 2013-11-08 14:02:21 -07:00
Thomas S Hatch
57f52a8941 discard manifest.in for salt cloud 2013-11-08 13:53:11 -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