valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
55,921 Commits 24 Branches 182 Tags 341 MiB
d73964ea3c
Commit Graph

4694 Commits

Author SHA1 Message Date
Justin Findlay
a0b76b57b3 clarify git rebase instructions 2015-05-25 23:05:23 -06:00
Justin Findlay
3517e0095f fix contribution docs link typos 2015-05-25 22:55:19 -06:00
Justin Findlay
651629c6a4 backport dev contrib doc updates to 2015.5 2015-05-25 22:54:54 -06:00
Mathieu Le Marec - Pasquet
458b18b7e6 more lxc docs 
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-23 15:19:54 +02: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
Nicole Thomas
0fcdb324c6 Merge pull request #24081 from jacobhammons/develop 
added custom search for each branch, fixed style issues
 2015-05-22 17:04:17 -06: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
Jacob Hammons
1e1eb2b3ea added custom search for each branch, fixed style issues 2015-05-22 11:53:33 -06:00
Colton Myers
58aed60838 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/runners/lxc.py
 2015-05-21 11:27:52 -06:00
jpic
d733cfb629 Document DHCP usage on LXC < 1.0.7 2015-05-21 14:26:01 +02:00
rallytime
113c6049f5 Update release note for 2015.5.1 2015-05-20 14:50:08 -06:00
Justin Findlay
1aa0420040 Merge pull request #23933 from jacobhammons/2014.7 
sphinx saltstack2 doc theme
 2015-05-20 12:19:19 -06:00
Colton Myers
9dbafcc051 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/digital_ocean_v2.py
    salt/modules/tls.py
 2015-05-20 11:59:59 -06:00
David Boucha
10338d0c54 Add links to Windows 2015.5.0-2 install downloads 2015-05-20 11:16:24 -06:00
David Boucha
b84f9756c5 updated Windows 2014.7.5-2 installer download link 2015-05-20 11:16:24 -06:00
Thomas S Hatch
63164900bd Merge pull request #23942 from jacobhammons/2015.5 
Updates to sphinx saltstack2 doc theme
 2015-05-20 09:43:54 -06:00
Drew Malone
fb0f1080dd Quick note on usability of 'include' statement. 2015-05-20 10:46:03 -04:00
Jacob Hammons
31023c8915 Updates to sphinx saltstack2 doc theme 2015-05-19 15:54:28 -06:00
Jacob Hammons
a3613e68e4 removed numbering from doc TOC 2015-05-19 15:35:16 -06:00
Colton Myers
36f0065faf Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    salt/client/ssh/wrapper/pillar.py
 2015-05-19 15:23:37 -06:00
Colton Myers
32b65dc2a9 Add extended changelog to 2014.7.6 release notes 2015-05-19 15:18:29 -06: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
Jacob Hammons
78b737c5e6 removed 2015.* release from release notes, updated index page to remove PDF/epub links 2015-05-19 13:53:31 -06:00
Jacob Hammons
e867f7df77 Changed build settings to use saltstack2 theme and update release versions. 2015-05-19 13:44:00 -06:00
Jacob Hammons
81ed9c9f59 sphinx saltstack2 doc theme 2015-05-19 13:36:57 -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
Colton Myers
a87b057137 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/ref/modules/all/salt.modules.slack_notify.rst
 2015-05-19 09:53:58 -06:00
Jacob Hammons
f7eb70ca60 changed previous release to 2014.7.6 2015-05-18 17:40:50 -06:00
Jacob Hammons
a56697bd6e Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5 2015-05-18 17:11:29 -06:00
Colton Myers
d8a60d6181 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/releases/index.rst
    salt/modules/saltutil.py
 2015-05-18 17:10:10 -06:00
Colton Myers
c2eed77691 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-05-18 17:07:15 -06:00
Colton Myers
dec153bcea Update the release notes index page 2015-05-18 17:06:27 -06:00
Colton Myers
49921b6cb2 Update the 2014.7.6 release notes with CVE details 2015-05-18 16:34:48 -06:00
dumol
379c09c3a5 Updated for SLES 12. 
Added updated instructions for latest SLES release, using the relevant repo.
 2015-05-18 13:11:42 -06:00
Nitin Madhok
2c13cf3302 Fixing more sphinx errors and warnings 2015-05-18 12:39:49 -04:00
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
Jacob Hammons
46eb2655ee saltstack2 sphinx theme updates 2015-05-17 20:39:24 -06:00
Jacob Hammons
e7442d3b1e Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5 2015-05-17 20:38:45 -06:00
Nitin Madhok
12ea8f5c52 Fixing more sphinx/docs errors and warnings 2015-05-16 19:24:04 -04:00
Jacob Hammons
ee3c1bd4a7 missed one 2015-05-15 16:26:47 -06:00
Jacob Hammons
3872921dd0 More updates to sphinx2 theme 2015-05-15 16:26:11 -06: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
Jacob Hammons
8c32152be0 removed TOC numbering, additional tweaks to layout.html 2015-05-13 21:18:00 -06:00
Jacob Hammons
73dfaeff28 Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5 2015-05-13 21:16:36 -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
Jacob Hammons
16d8a753ad saltstack2 sphinx theme and build settings 2015-05-11 17:29:12 -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
Erik Johnson
4fea5ba477 Add missing RST file 2015-05-06 12:06:49 -05:00
Erik Johnson
0504e7a184 Update Lithium docstrings in 2015.2 branch 2015-05-06 11:01:53 -06:00
Colton Myers
8510a4c30e Update to release notes from 2015.2 branch 2015-05-06 10:48:06 -06:00
Colton Myers
3255fbc0d5 Rename the release notes 2015-05-06 10:47:16 -06:00
Erik Johnson
d395565bf7 Update Lithium docstrings in 2015.2 branch 2015-05-06 09:27:40 -05:00
Erik Johnson
20006b06f6 Update Lithium docstrings in 2014.7 branch 2015-05-06 09:12:37 -05:00
Matt Robenolt
2e55f55c5d Add salt.loader.grain_funcs 
Exposes all of the functions that make up all of the grains. This
allows a user to call individual grain functions without collecting
all of them.
 2015-05-05 20:12:06 -07:00
David Boucha
10e0a2a0a2 clean up doc a bit 2015-05-05 17:14:57 -06:00
David Boucha
750bae117d add docs for the fire_event state feature 2015-05-05 17:14:57 -06:00
Justin Findlay
747c061ced Merge pull request #23394 from whiteinge/doc-deprecate-halite 
Deprecated Halite from the Salt docs
 2015-05-05 17:03:55 -06:00
Colton Myers
2981aed48e Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-05-05 16:49:31 -06:00
Colton Myers
fd09cdae6f Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/ssh/roster.rst
    salt/client/ssh/__init__.py
    salt/client/ssh/wrapper/__init__.py
    salt/config.py
    salt/modules/file.py
    salt/runners/lxc.py
 2015-05-05 16:26:39 -06:00
Colton Myers
b261c95cd6 Add note to 2015.2.0 release notes about master opts in pillar 2015-05-05 16:14:42 -06:00
Colton Myers
b2f033f485 Add CLI note 2015-05-05 16:02:26 -06:00
Seth House
dc6eac4f69 Deprecate Halite from the Salt docs 2015-05-05 16:01:35 -06:00
Colton Myers
48e7b3ee4f Add warning about python_shell changes to 2015.2.0 release notes 2015-05-05 15:54:50 -06:00
Justin Findlay
1aa27ed38e Merge pull request #23387 from rallytime/labels_docs 
Add some "What are all these labels for?" documentation
 2015-05-05 15:40:28 -06:00
Thomas S Hatch
8c057e6794 Merge pull request #23335 from steverweber/2015.2 
2015.2: include doc in master config for module_dirs
 2015-05-05 15:28:58 -06:00
rallytime
0fe9d05ab0 Make sure the parameters are in the correct order 2015-05-05 14:35:44 -06:00
rallytime
e9491e8991 Add "* Change" label parameters 2015-05-05 14:21:25 -06:00
rallytime
8024acc7ad Remove "workaround" wording 2015-05-05 13:47:34 -06:00
rallytime
ed788a2965 Some small fixes 2015-05-05 13:37:44 -06:00
rallytime
475a32d3aa Link the new labels doc in contributing and hacking docs 2015-05-05 13:23:08 -06:00
rallytime
644201aed8 Add pull request label definitions 2015-05-05 13:11:59 -06:00
Colton Myers
c223309bb7 Add versionadded 2015-05-05 12:44:50 -06:00
Ryan Lane
f03c68655c Add missing pagerduty and boto docs 2015-05-04 23:31:26 -07:00
Colton Myers
cb69cd07de Match the master config template in the master config reference 2015-05-04 15:05:21 -06:00
Colton Myers
91dd9dcbdc Add ssh_minion_opts to master config ref 2015-05-04 15:00:28 -06:00
Colton Myers
c273ea14c6 Add minion config to salt-ssh doc 2015-05-04 14:48:19 -06:00
Colton Myers
a0b6b760c3 Add minion_opts to roster docs 2015-05-04 14:46:16 -06:00
rallytime
3c95bd9a6b Add Feature Request label definition 2015-05-04 12:43:34 -06:00
rallytime
1780e2eb8a Add issue definition and augment functional areas section 2015-05-04 11:39:32 -06:00
Steve Weber
97513b060a include module_dirs 
include module_dirs
 2015-05-04 13:00:31 -04:00
rallytime
85e9284bac Start a "what are all of these labels for?" doc 2015-05-03 21:11:18 -06:00
Nicole Thomas
c85094df5d Merge pull request #23305 from farcaller/typo 
Fixed a Runenr typo in the docs
 2015-05-03 14:43:27 -06:00
Nicole Thomas
a624abddae Merge pull request #23306 from nmadhok/vmware-cloud-driver 
VMware cloud driver doc fixes
 2015-05-03 14:42:17 -06:00
Nitin Madhok
49f5789934 VMware cloud driver doc fixes 2015-05-03 16:14:07 -04:00
Vladimir Pouzanov
921aaea9b4 Fixed a Runenr typo in the docs 2015-05-03 18:47:15 +01:00
Thomas S Hatch
1a93deaf17 Merge pull request #23275 from terminalmage/issue5504 
Add pkg.group_installed state
 2015-05-02 18:41:39 -06:00
Seth House
d844ca5112 Removed docs for ext_pillar module that is a wip 2015-05-01 14:24:01 -06:00
Seth House
6be273d5f3 Removed stormpath_mod and linodepy docs; these were renamed 2015-05-01 14:24:00 -06:00
Seth House
cda915bcd4 Remove fsutils module documentation 
This module was moved to the utils folder in #17883.
 2015-05-01 14:13:59 -06:00
Seth House
901fa33440 Mocked tornado.httputil 
Refs #22820
 2015-05-01 13:57:43 -06:00
Erik Johnson
282ec1b8ec Exclude groupinstall alias from docs 2015-05-01 13:38:45 -05:00
Joseph Hall
4b836e0b17 Merge pull request #23251 from nmadhok/vmware-portgroup 
Adding support to be able to specify distributed virtual port group or standard switch network upon VM creation
 2015-05-01 09:02:25 -06:00
Nitin Madhok
dc7903b110 Adding support to be able to add distributed virtual portgroup to vm upon creation 2015-04-30 21:34:31 -04:00
Joseph Hall
3dea1e98a1 Add tornado to http.query, and make it the default 2015-04-30 14:07:51 -06:00
Erik Johnson
23a827547c Add docker-ng state docs to toctree 2015-04-30 11:19:37 -05:00
Joe Healy
f791a2c1e6 Clean up of docs following jessie 2015-04-30 23:48:32 +10:00
Colton Myers
cca8ddc886 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    .pylintrc
    .testing.pylintrc
    salt/auth/pam.py
    salt/modules/win_status.py
    salt/utils/network.py
    salt/utils/schedule.py
    tests/unit/renderers/gpg_test.py
    tests/unit/states/boto_secgroup.py
 2015-04-29 12:01:52 -06:00
Seth House
35c91881ab Added note about debugging reactor files to see the rendered output 2015-04-28 14:48:38 -06:00
Colton Myers
a8f797e0e4 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-04-28 09:48:53 -06:00
rallytime
f6cc7c8f8a Adjust ZeroMQ 4 docs to reflect changes to Ubuntu 12 packages 
Removed the chrislea ppa third party installation information. This
shouldn't be needed anymore for any Ubuntu package after 2014.7.5.
 2015-04-27 15:57:41 -06:00
Colton Myers
befb666623 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    salt/modules/mongodb.py
    salt/utils/http.py
    salt/utils/process.py
    tests/integration/__init__.py
 2015-04-27 10:28:53 -06:00
Thomas S Hatch
9ca2d58b10 Merge pull request #23058 from plastikos/improvement-compound_as_list 
[improvement] compound match as list
 2015-04-25 10:57:49 -06:00
Thayne Harbaugh
6f4cfd01fc Specify compound matches as lists 
Compound matches, such as nodegroups, can now be specified as lists.  This
avoids splitting on whitespace which may be part of a key or value.

Right now this only works for nodegroups.  Making the argument to "-C"
(compound list) a JSON argument is a future task.
 2015-04-24 17:00:04 -06:00
C. R. Oldham
63fafe961e Clarify the nature of auth and start events. 2015-04-24 12:46:32 -06:00
Colton Myers
a18e017619 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/man/salt.1
    doc/ref/cli/salt.rst
 2015-04-24 10:07:48 -06:00
Justin Findlay
24d2c6f501 Merge pull request #23011 from plastikos/improvement-leading_not 
Add a versionadded note for the leading "not"
 2015-04-24 08:11:34 -06:00
Thayne Harbaugh
993373655a Allow grain and pillar delimiter to be specified in compound matcher syntax. 2015-04-23 23:26:49 -06:00
Thayne Harbaugh
bbd063fdee Add a versionadded note for the leading "not" 2015-04-23 22:27:10 -06:00
Thomas S Hatch
de24ecfc90 Merge pull request #22966 from techhat/stormpathup 
Updates to Stormpath as per @rdegges
 2015-04-23 21:44:58 -06:00
Thomas S Hatch
57999117f2 Merge pull request #22969 from plastikos/improvement-leading_not 
Allow compound expressions to begin with "not"
 2015-04-23 21:44:45 -06:00
Justin
8486e17ab3 Added retry_dns to minion doc. 2015-04-23 15:33:59 -06:00
Jonathan Ballet
19efd419b5 Improve state_output documentation 
List all the available settings in the documentation and on the command
line.
Also, make the documentation clearer about the different possibilities.
 2015-04-23 10:22:11 +02:00
Thayne Harbaugh
d6fe499f55 Allow compound expressions to begin with "not" 2015-04-22 17:38:17 -06:00
Joseph Hall
2a4ef7ce3b Updates to Stormpath as per Randall Degges 2015-04-22 15:59:09 -06:00
Colton Myers
82477562dd Release 2014.7.5 2015-04-22 15:56:03 -06:00
Colton Myers
1a38b4b834 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    salt/cli/salt.py
    salt/client/mixins.py
    salt/renderers/pyobjects.py
 2015-04-22 11:07:01 -06:00
Thomas S Hatch
022a43aaa9 Merge pull request #22904 from jacobhammons/2015.2 
Regenerated man pages
 2015-04-21 12:51:48 -06:00
Jacob Hammons
99abfd7755 Regenerated man pages 2015-04-21 11:33:30 -06:00
Jacob Hammons
32ef5ca397 Revert "Regenerated man pages" 
This reverts commit 069a0cac71.
 2015-04-21 11:27:31 -06:00
Jacob Hammons
069a0cac71 Regenerated man pages 2015-04-21 11:20:52 -06:00
Colton Myers
bd6ecdfd43 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    doc/topics/installation/windows.rst
    doc/topics/tutorials/gitfs.rst
    salt/pillar/pepa.py
    salt/states/artifactory.py
    salt/states/pip_state.py
    salt/transport/__init__.py
 2015-04-21 10:42:22 -06:00
Colton Myers
92c51affc5 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-04-21 10:33:39 -06:00
Pedro Algarvio
95d6887949 Don't fail on make clean just because the directory does not exist 2015-04-21 00:46:09 +01:00
Colton Myers
1f9934c634 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/installation/windows.rst
    doc/topics/tutorials/gitfs.rst
 2015-04-20 11:39:41 -06:00
Joseph Hall
3b17858052 Merge pull request #22837 from nmadhok/vmware-cloud-driver 
Making vmware cloud driver Python3 compatible and other additions
 2015-04-19 15:57:43 -06:00
Nitin Madhok
64e527c4dc Adding ability to modify/create SCSI adapters #22364 2015-04-18 17:09:11 -04:00
Justin Findlay
900c7a510f Merge pull request #22800 from terminalmage/issue21979 
Improve error logging for pygit2 SSH-based remotes
 2015-04-18 11:18:55 -06:00
Justin Findlay
e99f2fdb28 Merge pull request #22813 from twangboy/win_doc_fix 
Updated instructions for building salt
 2015-04-17 22:10:07 -06:00
Nicole Thomas
dcd9e16a5c Merge pull request #22784 from techhat/stormpath 
Adding and updating Stormpath modules
 2015-04-17 16:50:25 -06:00
twangboy
adc421acdd Fixed some formatting issues 2015-04-17 15:03:47 -06:00
twangboy
8901b3b5a6 Updated instructions for building salt 2015-04-17 14:41:46 -06:00
rallytime
5931a582d1 Replace all 4s with 5s 2015-04-17 14:15:33 -06:00
rallytime
eadaead755 Add 2014.7.5 links to windows installation docs 2015-04-17 14:13:40 -06:00
rallytime
36b54ee79b Remove extra line 2015-04-17 12:53:58 -06:00
rallytime
93a858c591 Added release note for 2014.7.5 release 2015-04-17 12:53:50 -06:00
Erik Johnson
98885f71d6 Add information about libssh2 requirement for pygit2 ssh auth 2015-04-17 13:24:14 -05:00
rallytime
fde1feed46 Remove extra line 2015-04-17 11:42:14 -06:00
rallytime
b19b95d992 Added release note for 2014.7.5 release 2015-04-17 11:41:07 -06:00
Joseph Hall
7ee6103007 Adding and updating Stormpath modules 2015-04-17 08:37:23 -06:00
Colton Myers
2210bd175e Merge pull request #22668 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-04-16 23:22:36 -06:00
Erik Johnson
e51a8e0e4a Add external anchor for "reloading modules" section of state docs 2015-04-16 20:17:25 -05:00
rallytime
662593c902 Change latest release version in doc sidebar 2015-04-16 15:00:36 -06:00
Colton Myers
66378be75e Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    doc/ref/states/requisites.rst
    salt/master.py
    salt/modules/win_pkg.py
 2015-04-16 12:27: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
Thomas S Hatch
b6e803910f Merge pull request #22753 from thatch45/doc_clear 
fix some bad sls data in a doc
 2015-04-16 11:58:17 -06:00
Thomas S Hatch
b20dbb822b fix some bad sls data in a doc 2015-04-16 11:49:35 -06:00
Colton Myers
ccfcedbf6b Go back to the 2015.2 version of salt.7 2015-04-16 11:46:30 -06:00
Colton Myers
8d9874a78a Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-04-16 10:37:38 -06:00
Justin Findlay
e586c66917 revise contributing documentation 2015-04-16 10:28:00 -06:00
Markus "Shorty" Uckelmann
1341784184 improve cmd.run env documentation 
Resolves #21840

Improved documentation to cmd.run(et.al.) env argument by mentioning
that variables as values will not be evaluated.
 2015-04-16 11:20:20 +02:00
Thomas S Hatch
6452590351 Merge pull request #22728 from whiteinge/fix-docmageddon 
Add several modules to the mocked modules list for the docs build
 2015-04-15 19:58:57 -06:00
Thomas S Hatch
f5b62236a0 Merge pull request #22726 from VynceMontgomery/patch-2 
fix link to bug reporting in FAQ
 2015-04-15 19:57:59 -06:00
Colton Myers
ff8561df8d Add minor CVEs to 2014.7.4 release notes 2015-04-15 19:01:28 -06:00
Seth House
fe8f3e0bce Added generated doc for clustershell roster module 2015-04-15 18:34:27 -06:00
Vynce Montgomery
80d6e9ec94 fix link to bug reporting in FAQ 
linebreak and bad path; one way or another, this was not rendering as a link.
 2015-04-15 16:54:11 -07:00
Seth House
aaf1917bdf Add mocked references for new module additions 2015-04-15 17:52:10 -06:00
Seth House
767c328420 Remove docs for old nagios_json module 2015-04-15 17:52:06 -06:00
Vynce Montgomery
0d2a0a3607 fix alphabetization 
things appeared to be missing because they were out of order.
 2015-04-15 15:39:10 -07:00
Oliver Bestwalter
20ce197674 Add mention of Windows release candidates 
... so the windows folks realize, that they can test RCs easily as well :)
 2015-04-15 21:32:48 +02:00
Thomas S Hatch
b8e0638753 Merge pull request #22616 from alxbse/winrm-support 
add initial support for WinRM in Windows cloud deployment
 2015-04-15 09:55:30 -06:00
Justin Findlay
3a5a60b5a7 Merge pull request #22688 from msteed/issue-22676 
Add missing command line options to man pages
 2015-04-14 23:17:47 -06:00
Michael Steed
70f1ca9ea5 Add missing command line options to man pages 
Refs #22676
 2015-04-14 17:32:56 -06:00
Jacob Hammons
6e416fc300 Regenerated salt-call and salt.7 man pages Refs #22239 2015-04-14 13:56:31 -06:00
Michael Steed
5efb284c22 Update salt-call manpage to match cli help text 
refs #22239
 2015-04-14 11:52:55 -06:00
Wolodja Wentland
c52e9a94af Remove enabled option from pkgrepo.managed 
The 'enabled' option was highly ambiguous in that pkgrepo.managed also supports
a 'disabled' one that should be enough to express if a repository should be
enabled or disabled. It is also assumed that users who use pkgrepo.managed also
intend to use the repository later on which is why we set 'disabled' to False by
default.

This closes #22147
 2015-04-14 18:05:03 +01:00
Colton Myers
9099884809 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/cloud/config.rst
    salt/modules/win_disk.py
    salt/modules/yumpkg.py
    salt/pillar/s3.py
    salt/states/service.py
    salt/utils/event.py
    tests/integration/netapi/rest_tornado/test_app.py
    tests/integration/netapi/test_client.py
    tests/unit/states/archive_test.py
 2015-04-14 11:03:03 -06:00
Corin Kochenower
60b48ce1c0 Simple textual change 2015-04-14 08:54:34 -06:00
rallytime
becc997de4 Apply release note fix to develop branch 2015-04-13 15:34:24 -06:00
rallytime
fb03af37d3 Add note about missing state internal keyword arguments to release notes 2015-04-13 15:29:55 -06:00
Thomas S Hatch
8712a8b14c Merge pull request #22614 from rallytime/apply-22610 
Apply release note change to develop
 2015-04-13 15:26:25 -06:00
Alexander Backlund
b7db2080d8 add initial support for WinRM in Windows cloud deployment 
fixes saltstack/salt#15984
 2015-04-13 16:03:37 -04:00
rallytime
1f243d6276 Apply release note change to develop 2015-04-13 13:53:03 -06:00
rallytime
9eb273f097 Add batch matching bug note to known issues in 2014.7.4 release notes 2015-04-13 13:35:48 -06:00
Nitin Madhok
031bb2bd65 Merge branch 'develop' of https://github.com/saltstack/salt into develop 2015-04-13 12:29:39 -04:00
Nitin Madhok
39f31b1ab0 Adding salt.engines.sqs_events.rst to doc 2015-04-13 12:20:42 -04:00
Nitin Madhok
87e70a7d3a Adding salt.engines.logstash.rst to doc 2015-04-13 12:20:09 -04:00
Mike Place
6a11ead5b4 Merge pull request #22453 from jacksontj/transport 
Abstracted Transport
 2015-04-13 09:38:52 -06:00
Joseph Hall
bbdf316063 Merge pull request #22483 from nmadhok/vmware-cloud-driver 
Adding more features to vmware cloud driver
 2015-04-11 18:31:03 -06:00
Nitin Madhok
4ab84a6bca Adding some documentation 2015-04-10 17:39:30 -04:00
rallytime
ccfa9f8158 Fix some broken links on the contributing docs 
Fixes #22537
 2015-04-10 14:06:36 -06:00
Thomas S Hatch
fbf35f94ab Merge pull request #22491 from plastikos/improvement-nested_nodegroups 
improvement: Support nested nodegroups
 2015-04-10 09:17:27 -06:00
Piotr Kasprzyk
6789306071 Fix misspellings 2015-04-10 12:21:20 +02:00
shanedlee
c874ca8c20 Added additional details regarding windows implementation 2015-04-09 11:32:13 -04:00
Thayne Harbaugh
6179839225 Improve documentation for nested nodegroup. 2015-04-09 01:43:18 -06:00
David Beitey
22ad5d0063 Update git URL & formatting for Windows install 
Secure cloning is the standard practice for GitHub (vs ``git://``); other minor formatting improvements.
 2015-04-09 10:42:28 +10:00
Thomas S Hatch
457ec179ae Add sudo user docs into salt 2015-04-08 14:41:05 -06:00
Joseph Hall
aa23eb0e26 Merge pull request #22448 from rallytime/migrate_old_cloud_config_docs 
Migrate old cloud config documentation to own page
 2015-04-08 12:32:35 -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
Thomas Jackson
92ff4ff37f typo fixing! 2015-04-08 09:15:50 -07:00
Thomas Jackson
3b7170dc71 Add initial transport docs 2015-04-08 09:08:13 -07:00
rallytime
cecca10668 Kill legacy cloud configuration syntax docs per techhat 2015-04-07 20:09:37 -06:00
rallytime
52a3d500e8 Beef up cloud configuration syntax and add pillar config back in 2015-04-07 18:56:40 -06:00
rallytime
9b5318fe71 Move old cloud syntax to "Legacy" cloud config doc 2015-04-07 18:41:21 -06:00
rallytime
7a9ce92dd9 Add docs explaing file_map upload functionality 
Fixes #16886
 2015-04-07 17:23:02 -06:00
Corin Kochenower
911345dd1a Add versionadded label for event_return 2015-04-07 14:15:03 -06:00
Thomas S Hatch
817d7679f4 Merge pull request #22418 from basepi/merge-forward-2015.2 
[2015.2] Merge forward from 2014.7 to 2015.2
 2015-04-07 11:00:32 -06:00
Thomas S Hatch
9808332e8b Merge pull request #22417 from whiteinge/doc-sshclient 
Add SSHClient to the Python API docs
 2015-04-07 10:45:13 -06:00
Colton Myers
25f9b2d2d1 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/cloud/action.rst
    doc/topics/cloud/function.rst
    doc/topics/reactor/index.rst
 2015-04-07 10:05:35 -06:00
Seth House
30ad8d99df Add SSHClient to the Python API docs 
I'm leaving cmd_sync out on purpose for now until we get eauth support
sorted.
 2015-04-07 09:53:02 -06:00
Thomas S Hatch
393ee4c87d Merge pull request #22390 from cro/pyshtrue_unless_onlyif 
Allow unless, onlyif, check_cmd to use python_shell=True
 2015-04-07 09:15:11 -06:00
Nitin Madhok
99bc6c9a49 Add some more examples for extra_config to documentation 2015-04-06 18:04:53 -04:00
Nitin Madhok
a659a39f18 Add some more examples for extra_config to documentation 2015-04-06 18:00:02 -04:00