Colton Myers
|
73b90f155e
|
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
doc/topics/cloud/gce.rst
doc/topics/windows/windows-package-manager.rst
salt/client/ssh/state.py
salt/cloud/clouds/ec2.py
salt/modules/defaults.py
salt/modules/file.py
salt/utils/cloud.py
|
2015-09-29 14:56:41 -06:00 |
|
rallytime
|
39a4ae5a6c
|
Remove hdd: 19 refs from SL docs - no longer available from SoftLayer.
|
2015-09-25 12:54:25 -06:00 |
|
rallytime
|
aafb776808
|
Add support for post_uri in SoftLayer cloud drivers
|
2015-09-18 16:24:51 -06:00 |
|
rallytime
|
531b44243d
|
Remove note - incorrect info
|
2015-09-16 19:30:03 -06:00 |
|
rallytime
|
fe74d203f5
|
Add the ability to specify multiple disks on the SoftLayer driver
Refs #19954
|
2015-09-16 16:46:02 -06:00 |
|
Colton Myers
|
274464a85b
|
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
doc/topics/reactor/index.rst
salt/cloud/clouds/digital_ocean_v2.py
salt/modules/groupadd.py
salt/modules/localemod.py
salt/modules/mysql.py
salt/modules/useradd.py
salt/modules/win_pkg.py
salt/modules/win_useradd.py
salt/netapi/rest_cherrypy/app.py
salt/pillar/s3.py
salt/returners/local_cache.py
salt/states/htpasswd.py
salt/states/user.py
|
2015-09-14 14:39:03 -06:00 |
|
rallytime
|
cb641f8145
|
Update softlayer docs for where to find apikey
|
2015-09-10 16:23:47 -06:00 |
|
Jacob Hammons
|
d8d5045d3b
|
Updates to cloud docs for the provider > driver change in provider configs.
Refs #24797
|
2015-08-10 09:20:26 -06:00 |
|
rallytime
|
0dba3feb63
|
Change provider config refernces to driver in docs
|
2015-06-17 16:41:03 -06:00 |
|
Thomas Jackson
|
498a612078
|
Whitespace cleanup
Conflicts:
doc/topics/cloud/linode.rst
doc/topics/cloud/misc.rst
doc/topics/cloud/parallels.rst
doc/topics/cloud/proxmox.rst
Conflicts:
doc/topics/development/architecture.rst
doc/topics/development/translating.rst
|
2014-12-11 07:53:19 -08:00 |
|
Chris Rebert
|
8af229253f
|
more copyediting
|
2014-04-30 13:55:48 -07:00 |
|
Joseph Hall
|
07af52c955
|
Rename softlayer-hw to softlayer_hw
|
2014-02-10 13:34:11 -07:00 |
|
Seth House
|
d379371aa7
|
Fixed misc rST syntax
|
2013-11-08 15:08:33 -07:00 |
|
Seth House
|
e4f638e6d7
|
Moved salt-cloud documentation into main docs dir
|
2013-11-08 14:08:36 -07:00 |
|