rallytime
|
8b35b367b3
|
Merge branch '2016.11' into '2017.7'
Conflicts:
- salt/modules/win_pkg.py
- salt/states/dockerng.py
|
2017-07-05 09:14:30 -06:00 |
|
rallytime
|
c2822e05ad
|
Remove references in docs to pip install salt-cloud
Instead, provide the option to use "-L" with the Bootstrap script.
Fixes #41885
|
2017-07-03 14:47:36 -06:00 |
|
Eric Radman
|
3f2e13d1fc
|
Remove repeated words in docs (#37871)
Found using
find . -name '*.rst' | xargs igor -R -r
|
2016-11-23 14:53:17 -07:00 |
|
C. R. Oldham
|
6cce575d40
|
Clarify that salt-cloud doesn't get installed by bootstrap
|
2016-06-30 10:27:52 -06:00 |
|
Jacob Hammons
|
209c641a41
|
Made udpates as suggested by @rallytime
|
2016-03-09 11:00:27 -07:00 |
|
Jacob Hammons
|
26d4991cb3
|
moved previous intro to new quick start topic (topics/cloud/qs.rst)
added new intro that explains the salt cloud configuration files
added an inheritance and minion startup state example to topics/cloud/config.rst
|
2016-03-07 16:06:16 -07:00 |
|