Commit Graph

4449 Commits

Author SHA1 Message Date
Nitin Madhok
9dc1e0b3ae Fixing sphinx errors and warnings 2015-05-18 12:12:07 -04:00
Justin Findlay
bf62d43993 Merge pull request #23848 from dumol/patch-1
Updated installation docs for SLES 12.
2015-05-18 09:27:04 -06:00
dumol
06bed050ae Updated for SLES 12.
Added updated instructions for latest SLES release, using the relevant repo.
2015-05-18 13:13:37 +03:00
Nitin Madhok
12ea8f5c52 Fixing more sphinx/docs errors and warnings 2015-05-16 19:24:04 -04:00
Colton Myers
4ea3f8f80a Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    salt/pillar/neutron.py
    salt/utils/http.py
2015-05-15 13:43:40 -06:00
Thomas S Hatch
d951bc8ad4 Merge pull request #22548 from terminalmage/docker-ng
Add docker-ng state module
2015-05-15 12:09:58 -06:00
Justin Findlay
94f9099307 Merge pull request #23723 from rallytime/bp-23568
Backport #23568 to 2015.5
2015-05-14 13:34:11 -06:00
Joseph Hall
bbec34abd3 Allow Salt Cloud to use either SCP or SFTP, as configured 2015-05-14 10:49:20 -06:00
Colton Myers
7d8038f134 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    debian/changelog
    salt/modules/win_pkg.py
    salt/pillar/__init__.py
    salt/states/file.py
2015-05-14 10:27:00 -06:00
Colton Myers
06a3ebd9d1 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-05-14 10:13:40 -06:00
Justin Findlay
4c844a43f1 Merge pull request #23693 from anastrophe/rm-deadlink-docs
Removed link to github page that no longer exists.
2015-05-13 23:04:34 -06:00
Paul Theodoropoulos
f7f002daf5 Removed link to github page that no longer exists. 2015-05-13 17:27:44 -07:00
Oliver Bestwalter
4ba0f20ef6 fix typos 2015-05-14 01:23:20 +02:00
Mike Place
bdbbfa6ee7 Start on 2015.5.1 release notes 2015-05-13 12:31:41 -06:00
Mike Place
d5986c21b4 Rename kwarg in cloud runner
Closes #23403
2015-05-13 12:15:06 -06:00
rallytime
580ed73840 Add a couple of grammar fixes to opts docs 2015-05-13 09:04:26 -06:00
Mike Place
1432077bd8 Add documentation about opts generation 2015-05-12 23:41:02 -06:00
Nicole Thomas
33b0b4a1ef Merge pull request #23596 from rallytime/merge-23584
Merge #23584 with pylint fixes and versionadded tags
2015-05-12 12:36:11 -06:00
Thomas S Hatch
8d8e2df3b8 Merge pull request #23571 from bemeyert/21840-use_existing_PATH_in_cmd_env
How to still use existing $PATH in "cmd" modules
2015-05-12 09:20:31 -06:00
Daniel Hobley
899ba78e79 Added power cfg module and state for windows minions
- Allows you to set power settings on a windows minion for things like the monitor and disk
2015-05-12 14:49:48 +02:00
Markus "Shorty" Uckelmann
61eab1e156 How to still use existing $PATH in "cmd" modules
Enhances #21840

Added a code example on how to still use the existing $PATH environment
variables in cmd modules. The code was taken from a mail from Ethan
Erchinger to the salt-users list.
2015-05-12 12:00:03 +02:00
Joseph Hall
d4b3518444 Allow Salt Cloud to use either SCP or SFTP, as configured 2015-05-12 02:05:27 -06:00
Colton Myers
115a26a275 Remove the rc sidebar entry 2015-05-11 16:32:47 -06:00
Colton Myers
1bb8a73afb Update latest release to 2015.5.0 2015-05-11 16:05:04 -06:00
Justin Findlay
24b512d961 Merge pull request #23555 from gravyboat/patch-1
Add details to first line of top docs
2015-05-11 15:57:45 -06:00
Forrest
552eb52c7b Add details to first line.
We don't specify the top.sls in the first sentence which can be mildly confusing.
2015-05-11 12:24:15 -07:00
Colton Myers
1d77ae9072 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    salt/cloud/clouds/ec2.py
    salt/modules/hipchat.py
    salt/modules/random_org.py
    salt/modules/serverdensity_device.py
    salt/modules/slack_notify.py
    salt/returners/__init__.py
    salt/states/iptables.py
2015-05-11 11:38:03 -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
Bogdan Radulescu
4f19852587 Made some claridications in the AWS provider for salt-cloud 2015-05-08 17:50:24 +03:00
Thomas S Hatch
bfcee39e99 Merge pull request #23399 from mattrobenolt/expose-grains
Add salt.loader.grain_funcs
2015-05-08 08:37:30 -06:00
Justin Findlay
682ef36f94 Merge pull request #23443 from ajacoutot/openbsd-doc
Add installation doc for OpenBSD.
2015-05-07 12:57:22 -06:00
David Boucha
5504778adf update to proper examples 2015-05-07 18:08:05 +00:00
Joseph Hall
b22060b377 Merge pull request #23428 from nmadhok/vmware-cloud-driver
Vmware cloud driver additions
2015-05-07 03:16:46 -06:00
Antoine Jacoutot
6608437767 Typo. 2015-05-07 09:51:00 +02:00
Antoine Jacoutot
47abe73b3a Add installation doc for OpenBSD. 2015-05-07 09:48:27 +02:00
Nitin Madhok
4a3f3bd709 Make sure the provider config field values are quoted Fixes #23360 2015-05-06 19:01:42 -04:00
Nitin Madhok
93b664d2f4 Fixes 2015-05-06 18:52:44 -04: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
Colton Myers
7729834d92 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
Conflicts:
    salt/client/ssh/wrapper/__init__.py
2015-05-06 15:45:11 -06:00
Colton Myers
ccf6690be8 Merge pull request #23398 from basepi/merge-forward-develop
Merge forward from 2015.2 to develop
2015-05-06 15:42:44 -06:00
Colton Myers
1fb84450f4 Merge pull request #23396 from basepi/merge-forward-2015.2
[2015.2] Merge forward from 2014.7 to 2015.2
2015-05-06 15:42:35 -06:00
Nitin Madhok
6184fcdfaa Doc fix 2015-05-06 17:38:04 -04:00
Nitin Madhok
bd57a99c28 Adding docs to be able to create/reconfigure new CD/DVD drives Fixes #23231 2015-05-06 17:32:03 -04:00
Colton Myers
23d4feb8b4 Merge remote-tracking branch 'upstream/2015.2' into 2015.5 2015-05-06 13:51:10 -06:00
Justin Findlay
8074d16d52 2015.2 -> 2015.5
Related to https://github.com/saltstack/salt-windows-dev/pull/10.
2015-05-06 11:40:01 -06:00
Erik Johnson
d6b62f73a4 Update manpages to reflect 2015.2 rename to 2015.5 2015-05-06 11:13:13 -06:00
Erik Johnson
a7447ac681 Add missing RST file 2015-05-06 11:13:05 -06:00
Erik Johnson
23fa4402dc Update manpages to reflect 2015.2 rename to 2015.5 2015-05-06 12:08:46 -05:00