Joseph Hall
|
d4b3518444
|
Allow Salt Cloud to use either SCP or SFTP, as configured
|
2015-05-12 02:05:27 -06:00 |
|
Colton Myers
|
ece63c36a3
|
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
doc/topics/ssh/roster.rst
salt/modules/win_groupadd.py
|
2015-05-06 15:49:50 -06:00 |
|
Erik Johnson
|
0504e7a184
|
Update Lithium docstrings in 2015.2 branch
|
2015-05-06 11:01:53 -06:00 |
|
Colton Myers
|
000de95974
|
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
.pylintrc
doc/ref/runners/all/salt.runners.nacl.rst
doc/topics/cloud/config.rst
salt/cli/salt.py
salt/client/mixins.py
salt/client/ssh/__init__.py
salt/loader.py
salt/minion.py
salt/modules/cassandra_cql.py
salt/modules/gpg.py
salt/modules/grains.py
salt/modules/iptables.py
salt/modules/yumpkg.py
salt/netapi/rest_cherrypy/app.py
salt/renderers/pyobjects.py
salt/returners/mysql.py
salt/runners/jobs.py
salt/state.py
salt/states/file.py
salt/states/service.py
salt/utils/minions.py
tests/integration/__init__.py
tests/integration/netapi/rest_tornado/test_app.py
tests/integration/states/cmd.py
|
2015-04-16 12:15:44 -06:00 |
|
Colton Myers
|
5f1a4b45b8
|
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
|
2015-04-08 10:38:34 -06:00 |
|
rallytime
|
7a9ce92dd9
|
Add docs explaing file_map upload functionality
Fixes #16886
|
2015-04-07 17:23:02 -06:00 |
|
Colton Myers
|
d17c908b42
|
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
doc/topics/pillar/index.rst
salt/beacons/diskusage.py
salt/beacons/network_info.py
salt/minion.py
salt/modules/iptables.py
salt/modules/nacl.py
salt/modules/win_firewall.py
|
2015-03-09 12:52:14 -06:00 |
|
rallytime
|
e9402e7564
|
Remove "Lithium" and change to "2015.2.0" for versionadded tags
|
2015-03-05 12:44:22 -07:00 |
|
Todd Wells
|
99114eeeeb
|
cloud timeout doc updates
|
2015-01-16 12:37:28 -08:00 |
|
Thomas Jackson
|
8b635fe07d
|
Comma Cleanup
|
2014-12-12 11:32:16 -08: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 |
|
Joseph Hall
|
9d6e4ff168
|
Get rid of Micro Instance examples
|
2014-09-27 11:09:08 -06:00 |
|
Daniel Wallace
|
14d45a25d2
|
document ssh_agent
|
2014-08-27 21:40:05 -05:00 |
|
Joseph Hall
|
3571d3eb3c
|
Cloud cache is now msgpack, not json
|
2014-08-22 13:22:25 -06:00 |
|
Nitin Madhok
|
41712eab04
|
Fixing more sphinx warnings and errors
|
2014-08-11 12:33:55 -04:00 |
|
Daniel Wallace
|
53bc8f9c3c
|
document use_sftp
|
2014-07-22 18:54:48 -05:00 |
|
Joseph Hall
|
a7c27ce3f6
|
Add warning to doc
|
2014-05-14 10:16:13 -06:00 |
|
Joseph Hall
|
73023efe47
|
Document known_hosts_file
|
2014-05-14 10:13:37 -06:00 |
|
Joseph Hall
|
aedee335e0
|
Document new cloud event diffs
|
2014-05-13 17:01:50 -06:00 |
|
Joseph Hall
|
03e6508158
|
Break out cachedir docs into their own section
|
2014-05-13 12:33:44 -06:00 |
|
Joseph Hall
|
67b4e01c17
|
Document the update_cachedir option
|
2014-05-13 12:31:42 -06:00 |
|
Nicolas Delaby
|
782420ca9a
|
Add new configuration for salt-cloud to tweak connections to the VM
|
2014-05-07 18:05:06 +02:00 |
|
Kyle Kelley
|
7d69e42de1
|
s/law/lay
|
2014-02-09 21:12:44 -07:00 |
|
Joseph Hall
|
9b1327e173
|
Changing aws to ec2 in docs
|
2013-11-22 10:56:57 -07:00 |
|
Seth House
|
e4f638e6d7
|
Moved salt-cloud documentation into main docs dir
|
2013-11-08 14:08:36 -07:00 |
|