rallytime
1b7efa91e0
Remove references to Beryllium in relevant docs
2015-07-08 11:17:01 -06:00
rallytime
4ac8a9460a
Add minimum Python Azure SDK verion to azure docs.
2015-06-25 15:26:50 -06:00
Julien Barbot
6d7e779e62
Fix typo in salt-cloud reactor section
2015-06-24 16:40:32 +02:00
rallytime
b3ef394abe
Clean up
2015-06-19 16:17:56 -06:00
rallytime
ddab875177
Update linode rest driver docs
2015-06-19 16:15:13 -06:00
Joseph Hall
d299475d34
Merge pull request #24796 from rallytime/deprecate_provider_for_driver
...
Deprecate using "provider" in favor of "driver" in cloud provider files
2015-06-19 09:43:26 -06:00
rallytime
5c5dfc557b
More aws --> ec2 references
2015-06-18 16:12:13 -06:00
rallytime
4de5afbe53
Replace references to aws with ec2
2015-06-18 16:06:57 -06:00
rallytime
d045fb579e
Add notes to map and gogrid docs -- don't use -P with map files
2015-06-18 14:25:20 -06:00
Colton Myers
a5c9681672
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/topics/releases/version_numbers.rst
salt/cli/batch.py
salt/minion.py
salt/state.py
setup.py
2015-06-18 11:43:11 -06:00
rallytime
404268286a
Add provider --> driver change to release notes
2015-06-18 10:14:02 -06:00
rallytime
0dba3feb63
Change provider config refernces to driver in docs
2015-06-17 16:41:03 -06:00
Andreas Lutro
d88e071e98
add information about linode location
2015-06-17 17:43:08 +02:00
Joseph Hall
b4dd2c40c6
Add versionadded
2015-06-16 15:52:18 -06:00
Joseph Hall
fb7957b730
Update docs for GoGrid
2015-06-16 15:42:40 -06:00
Colton Myers
94d6ef1d17
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/ref/modules/all/salt.modules.ipmi.rst
doc/ref/states/all/salt.states.tls.rst
doc/topics/cloud/index.rst
doc/topics/cloud/vsphere.rst
doc/topics/eauth/index.rst
salt/cli/batch.py
salt/modules/cmdmod.py
salt/modules/ipmi.py
salt/netapi/rest_cherrypy/app.py
salt/runners/http.py
salt/states/boto_elb.py
salt/states/dockerio.py
salt/states/linux_acl.py
salt/states/win_servermanager.py
salt/wheel/config.py
2015-06-09 11:41:07 -06:00
Nicole Thomas
87e1c6008c
Merge pull request #24459 from basepi/merge-forward-develop
...
Merge forward from 2015.5 to develop
2015-06-08 22:27:08 -06:00
rallytime
d876535d71
Add Getting Started with VSphere doc to 2015.5
2015-06-08 10:23:47 -06:00
rallytime
b685ebc104
Add vSphere deprecation warnings to 2015.5
2015-06-08 10:22:50 -06:00
Thomas S Hatch
6c4cef2324
Merge pull request #24478 from nmadhok/vmware-cloud-driver
...
Vmware cloud driver additions and refactors
2015-06-08 09:27:37 -06:00
Nitin Madhok
ceac83dd59
Deprecating vsphere cloud driver in favor of vmware cloud driver
2015-06-07 17:53:33 -04:00
Nitin Madhok
94ebd4bc63
Show same examples for memory
2015-06-07 04:21:07 -04:00
Nitin Madhok
e7b855f9ca
adding docs for ability to specify memory in mb and gb
2015-06-07 04:18:53 -04:00
Colton Myers
6d503c12ea
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/ref/modules/all/salt.modules.ipmi.rst
doc/ref/modules/all/salt.modules.system_profiler.rst
salt/fileclient.py
salt/loader.py
salt/modules/tls.py
salt/modules/win_path.py
salt/states/pkg.py
salt/utils/event.py
salt/utils/pagerduty.py
tests/unit/modules/seed_test.py
2015-06-05 13:03:48 -06:00
Jacob Hammons
1f7a13d6f9
Salt cloud doc updates, build errors and bug fixes
...
Refs #24309
2015-06-04 16:42:47 -06:00
Edouard Bonlieu
908b27869d
Add Getting Started for Scaleway provider
2015-06-04 16:23:06 +02:00
Colton Myers
baf4337918
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/modules/lxc.py
salt/roster/clustershell.py
2015-06-03 13:47:08 -06:00
rallytime
a235b114d7
Remove references to mount_points in ec2 docs
...
Fixes #14021
2015-06-02 16:32:26 -06:00
Colton Myers
288d49e51c
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/modules/ipmi.py
2015-06-02 15:51:50 -06:00
Joseph Hall
ca535a6ff4
Add warning about destroying maps
2015-06-01 15:25:58 -06:00
Colton Myers
5fcbcfe6d5
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/topics/cloud/digitalocean.rst
doc/topics/tutorials/index.rst
salt/cloud/clouds/digital_ocean.py
salt/modules/lxc.py
salt/returners/__init__.py
2015-05-29 17:33:28 -06:00
Thomas S Hatch
742cf7e4dd
Merge pull request #24256 from rallytime/remove_digital_ocean_v1
...
Deprecate digital_ocean.py in favor of digital_ocean_v2.py
2015-05-29 17:09:12 -06:00
Colton Myers
75590cf490
Merge pull request #24080 from makinacorpus/lxc_consistency2
...
Lxc consistency2
2015-05-29 16:51:54 -06:00
Colton Myers
c4f5e231fa
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2
...
Conflicts:
doc/_themes/saltstack2/layout.html
doc/conf.py
doc/index.rst
doc/ref/modules/all/salt.modules.hipchat.rst
doc/topics/releases/index.rst
salt/client/ssh/client.py
salt/cloud/clouds/vsphere.py
salt/modules/boto_dynamodb.py
salt/modules/boto_route53.py
salt/modules/data.py
salt/modules/http.py
salt/modules/tls.py
salt/output/compact.py
salt/states/boto_elb.py
salt/states/linux_acl.py
salt/states/rabbitmq_user.py
salt/states/win_servermanager.py
salt/utils/dictupdate.py
salt/wheel/config.py
2015-05-29 15:10:13 -06:00
rallytime
c10453e844
Deprecate digital_ocean.py in favor of digital_ocean_v2.py
...
The removes support for the original digital_ocean.py driver in salt-cloud
and replaces the original digital_ocean.py driver with the digital_ocean_v2.py
driver. The digital_ocean_v2.py driver is renamed to just digital_ocean.py.
2015-05-29 14:32:42 -06:00
rallytime
8d51f75aa5
Clarify digital ocean documentation and mention v1 driver deprecation
...
Fixes #21498
2015-05-29 14:14:19 -06:00
Jacob Hammons
0689815d0e
Fixes for doc build errors
2015-05-27 11:40:31 -06:00
thanhnt
e1d06f9764
fix code block syntax
2015-05-26 08:57:46 -06:00
Mathieu Le Marec - Pasquet
ef1f95231a
lxc docs: typos
2015-05-23 14:49:34 +02:00
Mathieu Le Marec - Pasquet
d67a43dc1f
more lxc docs
2015-05-23 14:45:43 +02:00
Mathieu Le Marec - Pasquet
ce11d8352e
lxc: Global doc refresh
...
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-22 23:21:13 +02:00
thanhnt
01b546e6e8
fix code block syntax
2015-05-23 00:57:42 +07:00
Colton Myers
8f53adb4e6
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/modules/lxc.py
2015-05-19 15:12:54 -06:00
Mathieu Le Marec - Pasquet
80eabe2703
lxc salt cloud doc
...
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-19 20:27:55 +02:00
jpic
a4bcd75171
Fixed wrong path in LXC cloud documentation
2015-05-19 18:54:07 +02:00
Joseph Hall
bbec34abd3
Allow Salt Cloud to use either SCP or SFTP, as configured
2015-05-14 10:49:20 -06:00
Joseph Hall
d4b3518444
Allow Salt Cloud to use either SCP or SFTP, as configured
2015-05-12 02:05:27 -06:00
Nitin Madhok
46dd8816f5
Merge branch 'develop' of https://github.com/saltstack/salt into vmware-cloud-driver
2015-05-09 01:40:42 -04:00
Nitin Madhok
3b9a41d06f
Adding port and protocol to the Getting started docs
2015-05-09 01:26:51 -04:00
Colton Myers
1bf2ff994e
Merge pull request #23430 from basepi/merge-forward-develop
...
Merge forward from 2015.5 to develop
2015-05-08 16:46:21 -06:00