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

6153 Commits

Author SHA1 Message Date
Justin Findlay
66332510c6 doc.ref.configuration.logging: document log levels 2016-08-10 14:10:43 -06:00
Justin Findlay
93616eff3e doc.ref.configuration.logging: fix formatting 2016-08-10 10:47:07 -06:00
Justin Findlay
472a2d31de doc.ref.configuration.logging: cleanup formatting 2016-08-10 10:46:39 -06:00
rallytime
2b4c156df1 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/grains/core.py
  - salt/output/highstate.py
 2016-08-08 11:15:43 -06:00
Thomas S Hatch
f8158124d5 Merge pull request #35211 from cachedout/issue_31074 
Alternative sudo users for salt-ssh
 2016-08-08 09:40:55 -06:00
Mike Place
f004b831d2 Merge pull request #35178 from cro/proxy_cache_fix2 
Add append_minionid_config_dirs option
 2016-08-07 07:21:14 +09:00
Mike Place
104116f464 Add release notes and include entry about disk.wipe fix 2016-08-07 06:58:55 +09:00
Mike Place
6f53232e6d Better error handling and a workaround for group mismatch. 2016-08-05 03:41:36 +09:00
Mike Place
5b56a4acf7 Docs 2016-08-05 03:24:18 +09:00
Jonathan Ballet
1642dba5d1 doc: fix broken links in the test documentation page 2016-08-04 16:56:42 +02:00
C. R. Oldham
84cc7d67c0 Add documentation for append_minionid_config_dirs. 2016-08-03 12:36:37 -06:00
rallytime
a64026fc99 Start release notes for 2016.3.3 2016-08-02 15:47:17 -06:00
Jacob Hammons
f4d869fb0f doc version updated to 2016.3.2 (#35147) 
updated the navigation headings
 2016-08-02 14:21:52 -06:00
Jacob Hammons
4967ed275f doc version update to 2015.8.11, updates to release notes (#35145) 2016-08-02 13:55:32 -06:00
rallytime
0d5f0b6016 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-02 10:40:26 -06:00
rallytime
fbaff3e98e Update 2016.3.0 release notes with repo.saltstack.com Xenial pkg availability 
Refs #33870
 2016-08-01 11:14:53 -06:00
rallytime
bdcc81a384 Start release notes file for 2015.8.12 2016-07-28 17:16:49 -06:00
rallytime
a2aae987a6 Update release notes with new changes 2016-07-27 09:53:19 -06:00
Denys Havrysh
0faa490991 Fix job scheduling using `when parameter (by python-dateutil`) 2016-07-26 17:37:28 +03:00
rallytime
9227c3dd26 Merge branch '2015.8' into '2016.3' 
Conflicts:
  -   -   -   -   -   -   -   -   - conf/master
 2016-07-21 13:39:21 -06:00
Nicole Thomas
7423177491 Update 2016.3.2 release notes (#34850) 2016-07-21 11:18:31 -06:00
Nicole Thomas
59fffa86bc Update release notes for 2016.3.2 (#34848) 2016-07-21 10:02:01 -06:00
Thomas S Hatch
6c35d88268 Fix #34648 (#34828) 2016-07-20 14:49:52 -06:00
Jacob Hammons
c3ae64c054 Updates man pages (#34756) 
adds link to all tutorials to using salt section
Refs #33923
 2016-07-18 15:36:50 -06:00
rallytime
ead3eb1606 Update azure lib dep to match the one in cloud.clouds.msazure 
Refs #27980
 2016-07-18 11:26:36 -06:00
rallytime
7d106c78f0 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-18 09:45:00 -06:00
Mike Place
abf5b976ed Merge pull request #34722 from rallytime/fix-34630 
Various spelling fixes
 2016-07-16 13:49:54 -06:00
rallytime
cca9446c37 Various spelling fixes 
Fixes #34630
 2016-07-16 13:17:09 -06:00
rallytime
9c803d05a5 Add output_file option to master config docs 
Fixes #34703
 2016-07-16 12:45:55 -06:00
rallytime
c2130d5a04 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-16 12:29:54 -06:00
Justin Findlay
aaa6f7d80a update 2015.8.11 release notes (#34682) 2016-07-14 15:23:26 -06:00
rallytime
0c566dce89 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-14 14:06:42 -06:00
rallytime
f734afd0b0 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/aptpkg.py
  - tests/integration/__init__.py
 2016-07-12 14:29:35 -06:00
Jacob Hammons
5e2ddb5eb0 Adds a mock required for the network settings beacon 2016-07-12 13:08:46 -06:00
Loren Gordon
bfe0dd0b8a Clarifies the proper way to reference states 
It seems in some situations, or in some earlier version, using a `/`
to reference sls files in subdirectories did work. However, because
of the inconsistency it caused occasional confusion. This updates the
tutorial to focus on the canonical `.` notation, which always works.
 2016-07-12 07:58:27 -04:00
Erik Johnson
ae38c874da Add a bunch of documentation on getting files from other environments (#34560) 
* Remove :members: from fileserver docs pages

These functions can never be invoked directly from the CLI, so it is
pointless to include them in the documentation.

* Rename section

* Add docs page clarifying how to get files from different environments

* Add reminder that file_roots can be specified for masterless salt

* Link to the new environments page from the states tutorial

* Add information on pulling reactor configs from non-base environments

* Add examples of querystring syntax to cp module
 2016-07-08 17:15:27 -04:00
rallytime
27988dde48 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/ref/configuration/minion.rst
 2016-07-07 12:31:12 -06:00
Mike Place
63f0451041 Merge pull request #34498 from rallytime/bootstrap-tutorial-doc-fix 
Use -O in the wget example in the bootstrap tutorial for the develop branch
 2016-07-07 10:30:46 -06:00
Erik Johnson
8722257b82 Improve top file merging documentation (#34505) 
* Add top file config params to minion config file documentation

* Improve documentation on top file merging behavior

* Add recommendation on changing top_file_merging_strategy

* Improve the log message warning of multiple top files
 2016-07-07 12:04:27 -04:00
rallytime
23c5739c3b Use -O in wget develop example in bootstrap tutorial 2016-07-06 15:23:39 -06:00
rallytime
2b307b7ea1 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/states/file.py
  - tests/unit/states/file_test.py
 2016-07-06 09:12:25 -06:00
C. R. Oldham
0a264597ca Forgot reference to inotify (#34455) 2016-07-05 12:32:49 -04:00
rallytime
8398de0baf Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-30 16:08:57 -06:00
C. R. Oldham
6cce575d40 Clarify that salt-cloud doesn't get installed by bootstrap 2016-06-30 10:27:52 -06:00
Nicole Thomas
70e1f18b89 Beacon network docs (#34386) 
* Add beacons/network_settings to doc build

* Add a versionadded tag for the beacons.network_settings module
 2016-06-30 11:12:55 -04:00
rallytime
f9ab8ba46d Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-28 14:26:24 -06:00
jacobhammons
0c60feac02 Doc clarifications to file modules, addition of new profile log level to docs, fixed example in dnsmasq (#34323) 
Refs #34249
Refs #34261
Refs #33694
Refs #34247
 2016-06-28 12:03:59 -04:00
rallytime
f44a0543fe Fix test example in integration testing docs 
The example is out of date compared to the actual test it's modeling.

Notably, the self.state_result() function doesn't exist.
 2016-06-27 10:22:15 -06:00
rallytime
318c2ed6a1 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cli/salt.py
  - salt/modules/grains.py
  - tests/unit/modules/boto_vpc_test.py
 2016-06-21 16:03:31 -06:00
Mike Place
3413c494bd Merge pull request #34173 from rallytime/fix-34162 
Update docs to match log_level default
 2016-06-21 10:15:53 -07:00
Nicole Thomas
47595d6795 Typo fix (#34174) 2016-06-21 12:08:43 -04:00
rallytime
f577681f0b Update docs to match log_level warning default 
Fixes #34162
 2016-06-21 09:31:59 -06:00
rallytime
73f3e12ce6 Update package dep note to systemd-python for RHEL7 install 
Fixes #34120
 2016-06-20 08:53:42 -06:00
rallytime
f6bfaede21 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/topics/installation/index.rst
  - salt/master.py
  - salt/modules/mac_brew.py
  - salt/modules/pacman.py
  - salt/modules/solarisips.py
  - salt/returners/postgres_local_cache.py
  - salt/states/apache_module.py
  - salt/utils/minions.py
  - tests/unit/acl/client_test.py
 2016-06-16 16:10:41 -06:00
Thomas S Hatch
dd26d6fd74 Merge pull request #34009 from rallytime/bp-33948 
Back-port #33948 to 2016.3 + add log message
 2016-06-16 15:01:09 -06:00
Jacob Hammons
ce027fd769 Fixes doc refresh bug on chrome mobile. 2016-06-16 12:43:33 -06:00
Thomas S Hatch
dd03024931 Merge pull request #34011 from rallytime/bp-33948-2015.8 
Back-port #33948 and #34009 to 2015.8
 2016-06-16 09:41:01 -06:00
Nicole Thomas
f546a00dc9 Merge pull request #34025 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-06-15 15:41:00 -04:00
Jacob Hammons
43b4a12aa2 Updated latest release version 2016-06-15 13:22:06 -06:00
Jacob Hammons
a4b67fd1e9 Updated latest release to 2016.3.1 
Clean up installation instructions
code-block type updates
Add link to jinja tutorial
 2016-06-15 11:52:02 -06:00
rallytime
78befde62f Add note to release notes about returner minions kwarg change 2016-06-14 12:51:44 -06:00
rallytime
c776d2d795 Add note to release notes about returner minions kwarg change 2016-06-14 10:33:41 -06:00
Mike Place
1132bc5d0b Merge pull request #33995 from jacobhammons/doc-fixes 
Understanding Jinja topic, Jinja doc issues.
 2016-06-13 19:00:29 -07:00
Mike Place
a400f6a6c3 Merge pull request #33900 from amendlik/gitfs-hook-doc 
Document sudo policy for gitfs post-recieve hook
 2016-06-13 18:04:35 -07:00
Jacob Hammons
887a415138 Adds new Understanding Jinja topic, and fixes several Jinja doc issues. 
Removes the "Full list of builtin ..." from each module reference list, leaving just the module type for scanability.

Refs #12470
Refs #10206
Refs #10480
Refs #23522
Refs #33023
 2016-06-13 18:30:42 -06:00
Jacob Hammons
b20213fd79 Adds links to several current Salt-related projects 
Removes the salt_projects.rst file which hasn't been updated in a long time, this is replaced by the updated topics/projects/index.rst file
Adds a note about Salt Pack to the installation doc
 2016-06-13 17:11:36 -06:00
Adam Mendlik
b4a28e2684 Add clarifying documentation about the need for sudo in the git hook 2016-06-13 13:22:39 -06:00
rallytime
19d49d94f2 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-13 11:13:38 -06:00
jacobhammons
4a8064918a Adds a "Generated on <timestamp>" line to the footer of each doc html page in the doc (#33962) 2016-06-13 11:24:40 -04:00
Jacob Hammons
2cf787d4ba 2016.3.0 known issues update 2016-06-12 20:58:21 -06:00
Seth House
b6ebd7b6ef Add docs for arg/kwarg eauth matching 
This adds documentation for the addition in #29153.
 2016-06-09 09:13:02 -06:00
Nicole Thomas
00e016ecfc Add note about Xenial packages to 2016.3.0 release notes (#33870) 
Refs #32761
 2016-06-09 10:52:16 -04:00
Adam Mendlik
1046279cb7 Document sudo policy for gitfs post-recieve hook 
Because the hook is run as the user performing the push,
salt-call will typically fail. This documentation change
uses sudo for salt-call, and provides a sudo policy that
permits any user to run the post-recieve hook.
 2016-06-09 07:10:12 -06:00
Justin Findlay
06f249901a add 2016.3.1 release notes (#33883) 2016-06-08 16:49:28 -06:00
rallytime
c5b4ec0b0f Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cli/salt.py
  - salt/modules/groupadd.py
  - salt/states/service.py
 2016-06-08 11:20:18 -06:00
Dan Slimmon
ea3498aedc Fixed spelling of "through" 2016-06-04 03:08:22 +00:00
Mike Place
500d4ccec2 Reminder not to return non-serializable data from states 
Refs #31837
 2016-06-03 12:13:47 -06:00
Elias Probst
646bc426c6
Typo (privilages → privileges) 2016-06-03 09:54:56 +02:00
Denys Havrysh
8621f5be54 Debian installation docs: drop section about community-maintained repository 2016-06-02 17:50:47 +03:00
Justin Findlay
9b0eb858a6 add note and workaround to release notes 2016-05-31 11:24:27 -06:00
Wolodja Wentland
259529e25d Use correct state name in libvirt formula doc (#33631) 
The state module for libvirt has been renamed to 'virt' from
'libvirt' in 2016.3 and these references to the old name have not been
updated.
 2016-05-31 11:09:25 -04:00
jacobhammons
65df3a6fa2 Refs #33543 2016-05-26 09:58:42 -06:00
Jacob Hammons
42e358af7d Updated version numbers in the docs for the 2016.3.0 release 2016-05-25 18:06:03 -06:00
Jacob Hammons
a424c38f5d New doc site layout, 2016.3.0 release note known issue additions 2016-05-25 17:39:55 -06:00
rallytime
a5e0141eda Merge branch '2015.8' into '2106.3' 
Conflicts:
  - salt/beacons/__init__.py
  - salt/modules/saltutil.py
  - salt/modules/zypper.py
  - salt/states/grains.py
  - salt/states/pkgrepo.py
  - salt/states/service.py
 2016-05-25 13:44:21 -06:00
rallytime
03b0c97520 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/configuration/minion.rst
 2016-05-25 12:26:00 -06:00
Mike Place
ee76be3b0b Merge pull request #33503 from rallytime/fix-15252 
Add docs about minion config file in standalone minion docs
 2016-05-25 10:23:07 -07:00
rallytime
cfc07f7641 Add docs about minion config file in standalone minion docs 
Fixes #15252
 2016-05-25 11:00:12 -06:00
Mike Place
f72ec1479b Merge pull request #33482 from rallytime/pillar-opts-docs 
Add pillar_opts docs to master.rst
 2016-05-25 09:39:25 -07:00
rallytime
b0a9f4181f Add docs for the syndic_finger config 
Fixes #18752
 2016-05-24 16:10:43 -06:00
rallytime
087564528d Add pillar_opts docs to master.rst 2016-05-24 13:26:24 -06:00
rallytime
7fd3e8f361 Fix docs about etcd config options and add pillar_opts doc 
Fixes #33423
 2016-05-24 13:19:20 -06:00
Nicole Thomas
00f9090928 Add docs about PyYAML's 1024 character limitations for simple keys (#33459) 
Fixes #33389
 2016-05-24 08:12:21 -07:00
rallytime
3aa1e6701c Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/win_pkg.py
 2016-05-23 15:10:06 -06:00
rallytime
7c41c34528 Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-05-23 09:40:21 -06:00
Justin Findlay
2cc650965a update 2015.5.11 release notes (#33412) 2016-05-20 15:08:35 -06:00
Nicole Thomas
3989e5b3de Spelling correction. (#33406) 2016-05-20 13:15:08 -07:00
Nicole Thomas
637c2af0ad Add note to absolute_imports practice about __future__ import (#33377) 
Fixes #31430
 2016-05-20 10:32:25 -07:00
rallytime
1febb0e13a Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-05-20 10:35:25 -06:00
jacobhammons
3c9def310c Merge pull request #33403 from jacobhammons/dot10 
2015.8.10 release notes
 2016-05-20 10:02:50 -06:00
Jacob Hammons
e850c298a9 2015.8.10 release notes 2016-05-20 10:01:32 -06:00
rallytime
5aec32b20f Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-05-19 18:18:10 -06:00
Mike Place
755acfb97e Improve doc clarity for disable_modules documentation (#33379) 
* Improve doc clarity for disable_modules documentation

* Additional clarification on blacklisted name
 2016-05-19 16:31:41 -06:00
rallytime
35ad788470 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - conf/minion
  - doc/ref/configuration/minion.rst
  - salt/modules/boto_elb.py
  - salt/modules/sudo.py
  - salt/states/boto_elb.py
  - salt/transport/zeromq.py
 2016-05-19 16:22:36 -06:00
Jacob Hammons
5ce502160b revved 2015.8 branch to .9 in version selector 2016-05-19 14:04:26 -06:00
Jacob Hammons
146b4df6be Updates docs version to 2015.8.9 
Adds note regarding the os grain on Mint Linux
Adds an FAQ regarding grains that change due to upstream changes
 2016-05-19 13:41:35 -06:00
Nicole Thomas
4fdb097c01 Update job_cache and keep_jobs docs to be more specific to their behavior (#33328) 
* Update job_cache and keep_jobs docs to be more specific to their behavior

Also fixed a bug discovered when investigating job_cache/keep_jobs functionality
where the jid directory and files were removed by the cache cleaner, but not the
original jid clash detection directory created in /var/cache/salt/master/jobs/.

Fixes #29286

* Add testcase for the changes in the local_cache.clean_old_jobs func

* Mark tests as destructive

* Put destructive test decorator in correct location
 2016-05-19 09:32:32 -07:00
Nicole Thomas
5c29c65ff4 Fix some link errors in the test writing tutorial (#33347) 2016-05-18 18:57:50 -06:00
C. R. Oldham
11a25255ec Bp 28467 calm mine (#33327) 
* make minion mine update behavior more configurable

* Add docs for mine_functions config var

* Remove config dup from mine config options

Refs #28467

* 2015.8 does not have _DFLT_MULTIPROCESSING_MODE

* This won't be in until 2015.8.10.
 2016-05-18 09:37:41 -07:00
C. R. Oldham
d375c1fe37 Add docs for mine_functions config var (#33326) 
* Add docs for mine_functions config var

* Note that mine_enabled essentially just doesn't add the mine
update function to the scheduler.
 2016-05-18 09:32:06 -07:00
Justin Findlay
089c1a2513 remove redundant, incorrect sudo_runas config documentation (#33318) 
* remove sudo_runas documentation

`sudo_runas` was renamed to `sudo_user` and the documentation was not
updated accordingly.

* conf/minion: update sudo_user description

The description from sudo_runas was better.
 2016-05-18 09:15:42 -07:00
rallytime
779f31cc20 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/ref/configuration/minion.rst
 2016-05-17 13:41:19 -06:00
Nicole Thomas
d0ed1616b0 Merge pull request #33308 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-05-17 13:26:05 -06:00
rallytime
1c43a62f85 Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-05-17 11:23:41 -06:00
Justin Findlay
7455d0da9b update 2015.8.9 release notes (#33310) 2016-05-17 11:13:09 -06:00
Nicole Thomas
9b42a05519 Added some more docs for master and minion config settings (#33292) 
* Added some more docs for master and minion config settings

Configs addressed:
  - auth_safemode
  - auth_timeout
  - conf_file
  - gather_job_timeout
  - jinja_lstrip_blocks
  - jinja_trim_blocks
  - max_event_size

* Change "sub minion" to "sub-minion"
 2016-05-17 09:58:20 -07:00
rallytime
5004d2fa61 Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-05-17 10:36:07 -06:00
jacobhammons
7e95127467 man pages updated (#33307) 
sphinx build fixes
doc additions for new modules including thorium
 2016-05-17 10:24:44 -06:00
David Boucha
757ef20a31 fix "loose" typo (#33290) 2016-05-16 17:13:40 -06:00
Nicole Thomas
b7d98da64d Add auth_tries config option to minion.rst docs (#33287) 2016-05-16 14:17:19 -07:00
rallytime
fdc877b4dc Document new master and minion config opts for 2016.3.0 
Docs were added for:
  - master_tries
  - mine_enabled
  - mine_return_job
  - syndic_failover
  - auth_tries: this is an old setting, but docs were not found
in the minion.rst docs. This change should be added to older branches.
 2016-05-16 14:51:13 -06:00
Nicole Thomas
061851bcbf Document minion_id_caching config value (#33282) 
Fixes #33276
 2016-05-16 13:12:38 -07:00
Nicole Thomas
59a84a4674 Add docs for new master failback options (#33280) 
Fixes #32492
 2016-05-16 12:11:38 -07:00
rallytime
32779b8d71 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/x509.py
 2016-05-16 10:47:12 -06:00
rallytime
bf641d3a66 Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-05-16 10:14:43 -06:00
Bruno Binet
d70e630f76 Add pillar.stack external pillar to 2016.3.0 release notes (#33265) 
* Add pillar.stack external pillar to 2016.3.0 release notes

* Fix typos in pillar.stack doc
 2016-05-16 07:17:51 -07:00
Nicole Thomas
4f3596a69f Add comment for test=true w/o changes ret and add changes dict example (#33254) 
Fixes #30258

Add simple changes dictionary example
 2016-05-15 13:13:43 -07:00
Nicole Thomas
2a30c4879b Update Git Policy docs to match Contribution guide (#33252) 
Fixes #30946
 2016-05-15 13:08:37 -07:00
Thomas S Hatch
94a53da92e Merge pull request #33253 from rallytime/fix-30605 
Update the release process docs
 2016-05-13 15:28:11 -06:00
rallytime
a129d05b6d Update the release process docs 
Fixes #30605
 2016-05-13 14:28:57 -06:00
Justin Findlay
8c2c5b13f0 update 2015.8.9 release notes (#33251) 2016-05-13 13:54:16 -06:00
Nicole Thomas
6fb25a8440 Make note of files that begin with '_' in master.d or minion.d dirs (#33224) 
* Make note of files that begin with '_' in master.d or minion.d dirs

Fixes #21903

* Be more specific about where '_' files come from.
 2016-05-13 09:14:57 -07:00
Nicole Thomas
64a89c4883 Add docs for the http state (#33222) 
* Add docs for the http state

Fixes #21315

* Fix typo
 2016-05-13 09:07:58 -07:00
Justin Findlay
c8236c05cb update 2015.8.9 release notes (#33237) 2016-05-13 08:40:23 -06:00
Justin Findlay
4b1f460256 update 2015.5.11 release notes (#33236) 2016-05-13 08:30:59 -06:00
rallytime
679200aeb2 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/scripts.py
 2016-05-12 16:52:27 -06:00
Nicole Thomas
730bec1eef [2015.8] Merge forward from 2015.5 to 2015.8 (#33207) 
* Fix file.managed for Windows (#33181)

* Revert back to import string_types

For some reason, there is a problem with the following
code when run from the file.py module:
```
from salt.ext import six
comment = 'This is a string'
isinstance(comment, six.string_types)
```
When run from within the python shell it works fine.

* Add six import

* Fix some lint

* Use correct six import

* Changed it back to explicit import

* Additional comments specific to 2015.5

* Fix file.managed for real

* Move comment to clarify purpose

* update 2015.5.11 release notes (#33197)

* Add pip installed and removed test (#33178)

* Resolve issue with pkg module on Mint Linux (#33205)

Closes #32198
 2016-05-12 13:54:47 -07:00
Justin Findlay
ce071330de update 2015.8.9 release notes (#33198) 2016-05-12 05:03:07 -06:00
Justin Findlay
96e3586f12 update 2015.5.11 release notes (#33197) 2016-05-12 04:54:40 -06:00
rallytime
a93c35d537 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cloud/deploy/bootstrap-salt.sh
 2016-05-11 16:36:42 -06:00
rallytime
f12bba6ebc Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/cloud/deploy/bootstrap-salt.sh
 2016-05-11 15:14:23 -06:00
Justin Findlay
e9108e0c1c add 2015.8.9 release notes (#33161) 2016-05-10 18:39:09 -06:00
Justin Findlay
43288b268d add 2015.5.11 release notes (#33160) 2016-05-10 18:12:56 -06:00
Nicole Thomas
ed2a7a7ad1 Merge pull request #33151 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-05-10 16:14:45 -06:00
C. R. Oldham
aed0f07349 Strip ldap fqdn (#33127) 
* Add option to strip off domain names on computer names that come from LDAP/AD

* Add strip_domains option for ldap.

* Add documentation for auth.ldap.minion_stripdomains.
 2016-05-10 14:42:19 -07:00
rallytime
c6f18fac3f Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/minion.py
 2016-05-10 15:13:24 -06:00
rallytime
c732c8104b Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/conf.py
 2016-05-10 09:27:18 -06:00
Mike Place
a1f286fc9b Move salt-ssh thin dir location to /var/tmp (#33130) 
* Move salt-ssh thin dir location to /var/tmp

Closes #32771

* Remove performance penelty language
 2016-05-10 07:36:03 -07:00
Seth House
878d34a865 Doc mock decorators (#33132) 
* Add mock function for mocking decorators

* Mock the stdlib user module because importing it will open the repl
 2016-05-10 07:25:13 -07:00
rallytime
92e0c17645 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-05-09 13:55:06 -06:00
Megan Wilhite
20c7e10793 clarify docs that map is designed to be run once. is not stateful (#33102) 2016-05-06 15:53:31 -06:00
rallytime
180c03ca24 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cli/salt.py
  - salt/modules/zypper.py
  - salt/scripts.py
  - salt/states/boto_elb.py
  - tests/integration/states/user.py
  - tests/unit/states/file_test.py
 2016-05-06 09:20:05 -06:00
Justin Findlay
a2c927b173 ssh docs: install py-2.6 for RHEL 5 2016-05-05 16:16:54 -06:00
Nicole Thomas
111701c8bb [2015.8] Merge forward from 2015.5 to 2015.8 (#33054) 
* Add run_on_start docs to schedule.rst (#32958)

Fixes #22580

* Backport #33021 manually to 2015.5 (#33044)

* Saltfile with pillar tests (#33045)

* add file.managed with pillar data tests

* do not require git for other tests

* Whitespace...
 2016-05-05 07:05:55 -07:00
Thomas S Hatch
813f27e807 Add clarity on docs for require sls 2016-05-04 10:18:19 -06:00
Thomas S Hatch
d81b82ed8b this blurb explains the syndic fixes, we should also have (#33022) 
this blurb in the release notes for the next 2015.8 point release
 2016-05-03 13:23:12 -06:00
Nicole Thomas
f00b5f91b3 Add run_on_start docs to schedule.rst (#32958) 
Fixes #22580
 2016-05-03 08:56:06 -07:00
rallytime
c12b9a5094 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-05-02 10:50:27 -06:00
brad-alexander
e7f7aa67d9 Add documentation for transport_opts (#32940) 2016-04-29 09:59:05 -06:00
Justin Findlay
b2d7c81f66 doc.ref.states.ordering: clarify requisite change (#32934) 2016-04-28 15:41:01 -06:00
rallytime
9033060106 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/states/archive.py
 2016-04-28 14:22:58 -06:00
Nicole Thomas
f581a8218d Remove FileClient class references from docs - it doesn't exist. (#32925) 
* Remove FileClient class references from docs - it doesn't exist.

Replace FileClient class references with mentions of the fileclient.py
module and replace code examples with salt.fileclient.get_file_client
examples.

Fixes #32646

* Don't reference minion import when not used
 2016-04-28 14:14:40 -06:00
Megan Wilhite
1cd6a45b8f specify volume tags in profile configuration (#32908) 2016-04-28 10:14:45 -06:00
Jacob Hammons
3887938727 added note about updating the bootstrap script in salt-cloud using the -u flag, removed the saltconf banner. 2016-04-26 15:08:59 -06:00
Nicole Thomas
71db10fd2c Merge pull request #32869 from rallytime/fix-32861 
Use correct config setting in cloud syndic docs
 2016-04-26 13:13:21 -06:00
rallytime
80fcdfb9d8 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/topics/targeting/grains.rst
  - salt/cli/daemons.py
  - salt/exceptions.py
  - salt/minion.py
  - salt/modules/schedule.py
  - salt/scripts.py
  - salt/states/archive.py
 2016-04-26 12:07:42 -06:00
Nicole Thomas
02c681311f Merge pull request #32844 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-04-26 11:38:08 -06:00
rallytime
0e73daa126 Use correct config setting in cloud syndic docs 
Fixes #32861
 2016-04-26 11:32:01 -06:00
Nicole Thomas
5ea003b387 Add pyvmomi version warning to Getting Started with VMware docs (#32845) 
Fixes #32824
 2016-04-25 16:46:51 -06:00
rallytime
9064d3bbfb Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/cloud/clouds/vmware.py
  - salt/modules/file.py
  - salt/states/archive.py
 2016-04-25 15:45:17 -06:00
Justin Findlay
2e80d71a8c add FreeBSD instructions to RC doc (#32783) 2016-04-25 15:26:45 -06:00
Nicole Thomas
f9ffcb697a [2016.3] Merge forward from 2015.8 to 2016.3 (#32784) 
* json encode arguments passed to an execution module function call

this fixes problems where you could pass a string to a module function,
which thanks to the yaml decoder which is used when parsing command line
arguments could change its type entirely. for example:

__salt__['test.echo')('{foo: bar}')

the test.echo function just returns the argument it's given. however,
because it's being called through a salt-call process like this:

salt-call --local test.echo {foo: bar}

salt thinks it's yaml and therefore yaml decodes it. the return value
from the test.echo call above is therefore a dict, not a string.

* Prevent crash if pygit2 package is requesting re-compilation of the e… (#32652)

* Prevent crash if pygit2 package is requesting re-compilation of the entire library on production systems (no *devel packages)

* Fix PEP8: move imports to the top of the file

* Move logger up

* Add log error message in case if exception is not an ImportError

* align OS grains from older SLES with current one (#32649)

* Fixing critical bug to remove only the specified Host instead of the entire Host cluster (#32640)

* yumpkg: Ignore epoch in version comparison for explict versions without an epoch (#32563)

* yumpkg: Ignore epoch in version comparison for explict versions without an epoch

Also properly handle comparisions for packages with multiple versions.

Resolves #32229

* Don't attempt downgrade for kernel and its subpackages

Multiple versions are supported since their paths do not conflict.

* Lower log level for pillar cache (#32655)

This shouldn't show up on salt-call runs

* Don't access deprecated Exception.message attribute. (#32556)

* Don't access deprecated Exception.message attribute.

To avoid a deprecation warning message in logs.
There is a new function salt.exceptions.get_error_message(e) instead.

* Fixed module docs test.

* Fix for issue 32523 (#32672)

* Fix routes for redhat < 6

* Handle a couple of arguments better (Azure) (#32683)

* backporting a fix from develop where the use of splay would result in seconds=0 in the schedule.list when there was no seconds specified in the origina schedule

* Handle when beacon not configured and we try to enable/disable them (#32692)

* Handle the situation when the beacon is not configured and we try to disable it

* a couple more missing returns in the enable & disable

* Check dependencies type before appling str operations (#32693)

* Update external auth documentation to list supported matcher. (#32733)

Thanks to #31598, all matchers are supported for eauth configuration.
But we still have no way to use compound matchers in eauth configuration.
Update the documentation to explicitly express this limitation.

* modules.win_dacl: consistent case of dacl constants (#32720)

* Document pillar cache options (#32643)

* Add note about Pillar data cache requirement for Pillar targeting method

* Add `saltutil.refresh_pillar` function to the scheduled Minion jobs

* Minor fixes in docs

* Add note about relations between `pillar_cache` option and Pillar Targeting
to Master config comments with small reformatting

* Document Pillar Cache Options for Salt Master

* Document Minions Targeting with Mine

* Remove `saltutil.refresh_pillar` scheduled persistent job

* Properly handle minion failback failure. (#32749)

* Properly handle minion failback failure.

Initiate minion restart if all masters down on __master_disconnect like
minion does on the initial master connect on start.

* Fixed unit test

* Improve documentation on pygit2 versions (#32779)

This adds an explanation of the python-cffi dep added in pygit2 0.21.0,
and recommends 0.20.3 for LTS distros. It also links to the salt-pack
issue which tracks the progress of adding pygit2 to our Debian and
Ubuntu repositories.

* Pylint fix
 2016-04-25 15:26:09 -06:00
Nicole Thomas
7141119ff6 add a tutorial around moving logic from maps.jinja to an execution module (#32840) 2016-04-25 15:24:12 -06:00
Andreas Lutro
3b81031d5b various improvements on cloud deploy script docs (#32659) 2016-04-25 14:00:24 -06:00
Justin Findlay
9b5c14c37c salt-cloud -u downloads stable version from bootstrap.saltstack.com by default (#32837) 
* salt-cloud -u downloads stable version

* utils.cloud.update_bootstrap: minor edits of docstring
 2016-04-25 13:53:54 -06:00
Nicole Thomas
36f70f5847 Merge pull request #32786 from rallytime/bp-32703 
Back-port #32703 to 2015.8
 2016-04-25 09:19:13 -06:00
Shammah Chancellor
baa4df25c9 Make example top file match templated version 
Currently the example top file under "Matching Grains in the Top File" has
node_type grains whose values do not match the names of the states which
they specify.  (e.g. the `webserver` node_type specifies the `web` state).  
Later these values are templated using jinja templates as if they are identical.

This commit adjusts the values in the example to be identical, so that the 
template example follows naturally.
 2016-04-22 13:32:56 -06:00
Erik Johnson
227ef4aabb Fix unnecessary capitalization 2016-04-22 14:05:03 -05:00
Erik Johnson
73cd9f26c3 Merge branch 'gitfs_perremote_doc_updates' of https://github.com/l2ol33rt/salt into pr-32775 2016-04-22 14:04:18 -05:00
Erik Johnson
cda00f4f93 Improve documentation on pygit2 versions (#32779) 
This adds an explanation of the python-cffi dep added in pygit2 0.21.0,
and recommends 0.20.3 for LTS distros. It also links to the salt-pack
issue which tracks the progress of adding pygit2 to our Debian and
Ubuntu repositories.
 2016-04-22 12:47:57 -06:00
Robert James Hernandez
b69d406ada Including name per-remote config option in example 2016-04-22 09:07:10 -07:00
Denys Havrysh
3751a270d7 Document pillar cache options (#32643) 
* Add note about Pillar data cache requirement for Pillar targeting method

* Add `saltutil.refresh_pillar` function to the scheduled Minion jobs

* Minor fixes in docs

* Add note about relations between `pillar_cache` option and Pillar Targeting
to Master config comments with small reformatting

* Document Pillar Cache Options for Salt Master

* Document Minions Targeting with Mine

* Remove `saltutil.refresh_pillar` scheduled persistent job
 2016-04-22 08:54:30 -06:00
Boris Feld
2cd08177be Update external auth documentation to list supported matcher. (#32733) 
Thanks to #31598, all matchers are supported for eauth configuration.
But we still have no way to use compound matchers in eauth configuration.
Update the documentation to explicitly express this limitation.
 2016-04-21 08:33:50 -06:00
Andreas Lutro
e8625c9be4 show the use of "name" and "kwarg" in examples 2016-04-20 19:23:40 +02:00
Colton Myers
3ec9502a86 Update "Low Hanging Fruit" to "Help Wanted" (#32675) 2016-04-19 07:03:46 -06:00
Mike Place
77bea56b68 Additional documentation on calling exec modules from templates (#32657) 
Refs #32612
 2016-04-18 12:16:00 -06:00
Erik Johnson
aa9c458346 Add json5 renderer (#32635) 
* Add JSON5 renderer

* Add documentation RST files for json5 renderer
 2016-04-16 12:37:42 -06:00
rallytime
bbec183474 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/minion.py
  - salt/states/user.py
 2016-04-15 13:58:50 -06:00
C. R. Oldham
4242bc7399 Language clarification. 2016-04-15 12:20:56 -06:00
C. R. Oldham
965e3bc1d1 Expand on the open-source vs open-core FAQ 2016-04-15 12:20:56 -06:00
Daniel Wallace
0b370d67b4 alphabetize directories for dynamic modules (#32599) 
Also add engines and proxy minions to the list.
 2016-04-15 08:58:19 -06:00
Erik Johnson
ab9da90ced Revert PR #32480 and apply #32314 with fixes / documentation (#32558) 
* Revert "Fix loop in maint.flo"

This reverts commit 5196cd6a6e5db3c7b1a47b1740881bbd3e87ea3d.

* Revert "Clear VCS fsbackend and git_pillar locks on master start"

This reverts commit 7e3caa9bae1ac4de62db9924374e35a8b826937e.

* Revert "Add functions to remove VCS fsbackend update locks and git_pillar update/checkout locks"

This reverts commit 4c2db32419022501eae2a695ec488693e043d189.

* prevent eternal gitfs lock due to process crash

* Use salt.utils.fopen() instead of open()

* Make pid locking work for more than just gitfs

Also, make logging more descriptive, to aid in troubleshooting.

* Add git_pillar_global_lock config option default value

* Document proper usage of {gitfs,git_pillar}_global_lock
 2016-04-14 10:36:59 -06:00
rallytime
b77993d9a1 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - doc/topics/targeting/grains.rst
  - salt/crypt.py
  - salt/scripts.py
  - salt/states/dockerng.py
  - salt/states/pkg.py
 2016-04-13 09:42:54 -06:00
rallytime
fbaeb165c9 Merge branch '2015.5' into merge-2015.8 
No conflicts.
 2016-04-13 09:07:39 -06:00
rallytime
46a4e8a310 Remove merge conflict line 2016-04-13 09:05:31 -06:00
Andrew Pashkin
e0d947c707 Document "grains" setting in the minion configuration reference 2016-04-13 08:56:05 -06:00
Nicole Thomas
e335e313fe Merge pull request #32487 from terminalmage/epoch-documentation 
Add explanation of nonzero epoch requirement to pkg.installed state documentation
 2016-04-11 14:48:57 -06:00
rallytime
4f03f2311f Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cli/salt.py
  - salt/modules/win_pkg.py
  - salt/transport/tcp.py
 2016-04-11 14:33:21 -06:00
Erik Johnson
e04cf879b6 Document new behavior of pkg.installed for yum/dnf packages with non-zero epoch 2016-04-11 14:42:23 -05:00
rallytime
1b04f0ddec Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - doc/ref/modules/all/index.rst
  - doc/ref/modules/index.rst
  - salt/modules/systemd.py
  - salt/modules/zypper.py
 2016-04-11 11:33:08 -06:00
Nicole Thomas
29333e533e Add documentation for some master/minion configs (#32454) 
Refs #32400

Adds docs for:

- cli_summary
- event_return_queue
- event_return_whitelist
- event_return_blacklist
- file_recv_max_size
- fileserver_followsymlinks
- fileserver_ignoresymlinks
- fileserver_limit_traversal
 2016-04-11 10:49:52 -06:00
Erik Johnson
f9306347cc Clarify the scope of the provider param in states. 2016-04-08 22:05:36 -05:00
Erik Johnson
af24c82ab0 Add documentation on virtual module provider overrides to the module docs 2016-04-08 22:01:14 -05:00
Erik Johnson
1948920674 Add external ref to windows package manager docs 2016-04-08 22:00:06 -05:00
Erik Johnson
e7fa21438c Add new doc pages to toctree 2016-04-08 21:59:21 -05:00
Erik Johnson
f0de1236ec Move the tables of virtual modules to individual documentation pages 2016-04-08 21:58:11 -05:00
Nicole Thomas
8d44aa3f08 Merge pull request #32429 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-04-08 10:56:12 -06:00
rallytime
1fa7c021b3 Add pgjsonb_queue to queue doc index 2016-04-08 09:08:17 -06:00
rallytime
59b804d230 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/pkgng.py
  - salt/modules/status.py
  - salt/states/boto_asg.py
  - salt/states/boto_elb.py
 2016-04-07 16:28:59 -06:00
rallytime
9531ea6ef5 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/topics/highavailability/index.rst
  - salt/loader.py
  - salt/modules/service.py
  - salt/states/cmd.py
  - tests/unit/states/cmd_test.py
 2016-04-07 16:10:32 -06:00
Justin Findlay
b27ccc424b update release candidate testing doc (#32414) 2016-04-07 09:41:46 -06:00
Erik Johnson
709410ada3 Improve git_pillar documentation/logging 
* Add note about different behavior of top file in git_pillar

* Make log entry for a missing pillar SLS file more accurate for git_pillar
 2016-04-07 09:10:53 -06:00
Nicole Thomas
c53efc3349 Update master config docs 2016-04-07 09:10:19 -06:00
Mike Place
3f03c5fcf9 Merge pull request #32374 from cachedout/issue_32066 
Update proxmox documentation
 2016-04-05 16:25:16 -06:00
Mike Place
62389d1d1a Update proxmox documentation 2016-04-05 16:24:26 -06:00
rallytime
760f479424 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/scripts.py
  - salt/state.py
  - tests/unit/config/config_test.py
 2016-04-05 15:09:27 -06:00
C. R. Oldham
3bbe284d89 Remove 'experimental' warning from SDB docs. 2016-04-05 09:42:34 -06:00
Ch3LL
2774da288d remove reference to master_alive_check 2016-04-04 13:49:33 -06:00
rallytime
d7b4b8b081 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/configuration/minion.rst
  - salt/config.py
 2016-04-04 12:36:14 -06:00
Mike Place
9065201761 Merge pull request #32316 from vutny/update-bootstrap-tutorial 
Update Salt Bootstrap tutorial
 2016-04-04 11:18:12 -06:00
Benjamin Drung
a7db152333 Fix typo dont -> don't 2016-04-04 14:56:29 +02:00
Benjamin Drung
d4c037301b Fix typo missmatch -> mismatch 2016-04-04 14:54:54 +02:00
Benjamin Drung
0f2c779b90 Fix typo fucntion -> function 2016-04-04 14:47:12 +02:00
Benjamin Drung
301e78b5be Fix typo vaules -> values 2016-04-04 14:28:35 +02:00
Benjamin Drung
8cada9573f Fix typos of retrieve 2016-04-04 14:27:41 +02:00
Benjamin Drung
b484d6f9c9 Fix typo directorys -> directories 2016-04-04 14:20:39 +02:00
Denys Havrysh
b9698f015d Update Salt Bootstrap tutorial 2016-04-02 17:06:44 +03:00
twangboy
c971a3b054 Add documentation for disabled the winrepos 2016-04-01 14:18:31 -06:00
Andreas Lutro
1d50edd8e9 add versionadded 2016-04-01 18:18:54 +02:00
rallytime
7e642b8381 Audit config.py default types and values - first sweep 
- Updated standard types in VALID_OPTS dict where necessary
- Updated default values to match VALID_OPTS in DEFAULT_*_OPTS dicts
- Updated master/minion configuration reference docs to match changes
- Removed enumerate_proxy_minions value as it's not referenced anywhere in code
 2016-03-31 13:50:51 -06:00
Andreas Lutro
7e620d5ee1 add documentation for --batch-wait 2016-03-31 19:58:11 +02:00
C. R. Oldham
7abf8becaa Documentation updates that go with PR #32252. 2016-03-31 10:41:24 -06:00
Jacob Hammons
ff8ca5ac2e Replaces incorrect reference to master_alive_check with master_alive_interval in docs 2016-03-30 20:32:43 -06:00
rallytime
fa5e17b342 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/win_service.py
  - salt/modules/zypper.py
  - salt/states/pkgrepo.py
 2016-03-30 15:33:13 -06:00
Jacob Hammons
50d1df2482 Fixes windows download paths to account for patch 2016-03-30 14:26:03 -06:00
jacobhammons
bf59f06733 Merge pull request #32217 from jacobhammons/dot8 
2015.8.8.2 release notes
 2016-03-29 11:53:22 -06:00
David Boucha
b48d0c6b5b Fix spelling error 2016-03-29 11:16:18 -06:00
Nicole Thomas
ab8b70d985 Merge pull request #32212 from rallytime/bp-32197 
Back-port #32197 to 2015.8
 2016-03-29 09:50:58 -06:00
Nicole Thomas
200d82cc3e Merge pull request #32211 from rallytime/bp-32210 
Back-port #32210 to 2015.8
 2016-03-29 09:50:42 -06:00
Todd Wells
5fdd81ace9 documentation fix issue 31844 2016-03-29 09:11:29 -06:00
Todd Wells
abd432746c documentation-fix-31931 2016-03-29 09:08:58 -06:00
Jacob Hammons
596444e2b4 2015.8.8.2 release notes 
Adds banner notifiying user when they are viewing release notes for an old release
 2016-03-29 06:38:04 -06:00
rallytime
40d09c822e Add some "best practices" information to test documentation 
Also clarifies some sections and fixes some broken links.
 2016-03-28 14:23:42 -06:00
rallytime
9adc2facb2 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-03-28 10:57:25 -06:00
Mike Place
63c8bf3542 Merge pull request #32160 from cachedout/issue_31944 
Fix beacon tutorial docs
 2016-03-25 16:32:51 -06:00
Mike Place
104ada5b6f Fix beacon tutorial docs 
Closes #31944
 2016-03-25 16:31:39 -06:00
rallytime
f6d9cdc633 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/ref/states/compiler_ordering.rst
  - doc/topics/installation/suse.rst
  - doc/topics/jobs/schedule.rst
  - doc/topics/targeting/grains.rst
  - doc/topics/tutorials/preseed_key.rst
  - doc/topics/tutorials/states_pt5.rst
  - pkg/suse/use-forking-daemon.patch
  - salt/minion.py
  - salt/modules/pacman.py
  - salt/modules/state.py
  - salt/modules/yumpkg.py
 2016-03-25 11:47:16 -06:00
Mike Place
a09aa18036 Merge pull request #32127 from rallytime/dunder-docs 
Add runners to __salt__ docs
 2016-03-25 09:54:02 -06:00
rallytime
482690ef33 Add note to docs about __salt__ referencing runner modules 2016-03-24 16:35:50 -06:00
rallytime
7554d0f42d Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/ref/states/include.rst
  - doc/topics/cloud/reactor.rst
  - doc/topics/reactor/index.rst
  - doc/topics/releases/2015.5.10.rst
  - doc/topics/tutorials/states_pt5.rst
  - doc/topics/windows/windows-package-manager.rst
  - salt/config.py
  - salt/modules/state.py
  - salt/states/grains.py
  - tests/integration/modules/sysmod.py
  - tests/unit/states/grains_test.py
 2016-03-24 15:48:00 -06:00