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
76,687 Commits 24 Branches 182 Tags 341 MiB
08d071bc68
Commit Graph

4068 Commits

Author SHA1 Message Date
Joseph Hall
08d071bc68 Update Azure ARM docs 2017-04-06 09:43:19 -06:00
Mike Place
28fc048030 Merge pull request #40464 from terminalmage/userdata-renderer 
salt-cloud: Do not pass userdata_file through yaml renderer
 2017-04-05 11:32:06 -06:00
Nicole Thomas
990bde4c07 Merge pull request #40530 from dmurphy18/aix_docupd 
Update release information for 2016.11.4 for additional AIX support
 2017-04-05 10:20:22 -06:00
Erik Johnson
73f4c43e2a Allow for userdata_template to be disabled in a cloud_profile 
This handles the case where a global value has been set and it is
necessary to disable it for a single profile.
 2017-04-04 15:41:43 -05:00
Erik Johnson
b440d0c679 Update 2016.11.4 release notes for userdata_renderer -> userdata_template 2017-04-04 15:41:43 -05:00
Erik Johnson
b580654f85 Update cloud docs to reflect userdata_renderer -> userdata_template 2017-04-04 15:41:43 -05:00
Erik Johnson
eddbd41265 Openstack did not have templating support for userdata_file before 2016.11.4 2017-04-04 15:41:43 -05:00
Erik Johnson
a85a416c72 Add userdata_renderer fix info to 2016.11.4 release notes 2017-04-04 15:41:43 -05:00
Erik Johnson
111188742a Add documentation for userdata_renderer 2017-04-04 15:40:50 -05:00
David Murphy
fd93caf206 Added further support for functionality on AIX for 2016.11.4 2017-04-04 13:57:37 -06:00
Mike Place
7a04ed2439 Merge pull request #40497 from DSRCorporation/features/39275_memcache 
Memcache documentation and minor updates.
 2017-04-04 13:55:17 -06:00
David Murphy
17b58917f2 Update release information for new AIX support 2017-04-04 13:51:14 -06:00
Dmitry Kuzmenko
82c45b1a52 Memcache documentation and minor updates. 2017-04-03 19:51:50 +03:00
rallytime
8111909bb1 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/topics/master_tops/index.rst
  - salt/runners/saltutil.py
 2017-04-03 10:41:01 -06:00
Mike Place
bda781d8f9 Grammar fix 2017-03-31 14:02:48 -06:00
rallytime
d5576d75e7 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/crypt.py
 2017-03-30 12:21:44 -06:00
Erik Johnson
0d7b0c4ef0 Improve the master_tops documentation 2017-03-30 11:56:15 -05:00
Ch3LL
f532ec5288 initial 2016.3.7 release notes 2017-03-29 09:34:03 -06:00
rallytime
5363e0b58b Update minion data cache documentation 
Updats the existing documentation and also adds more documentation
to the Multi-Master and Syndic topology files about the addition
of the pluggable minion data store.
 2017-03-24 14:25:46 -06:00
David Boucha
3ba50d3c52 add info about what is cached 2017-03-24 11:49:26 -06:00
David Boucha
77e8f6aff9 fix config example 2017-03-24 11:49:26 -06:00
David Boucha
61f2fa9339 Add documentation for the Minion data cache 
Includes docs for localfs and consul minion data cache modules
 2017-03-24 11:49:26 -06:00
rallytime
5c5b74b09a Merge branch '2016.3' into '2016.11' 
Conflicts:
  - pkg/windows/req.txt
 2017-03-22 17:20:58 -06:00
rallytime
2ead188b4f Update release notes for 2016.3.6 2017-03-22 14:21:29 -06:00
rallytime
a55c4138a8 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-03-21 10:13:56 -06:00
Erik Johnson
a42be82993 Link to minion start reactor example from FAQ. 
This provides a natural solution to the chicken-and-egg problem
identified in the FAQ. It also changes the name of the event in the
reactor example, as I think we may have stopped sending the legacy
(i.e. not-namespaced) events, so the "minion_start" event in the example
would be incorrect.
 2017-03-21 10:01:20 -05:00
Ch3LL
9c6d8d892f additional PRs/issues for 2016.3.6 release notes 2017-03-20 15:45:29 -06:00
rallytime
626bd03885 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/runners/manage.py
 2017-03-16 10:43:18 -06:00
Ch3LL
a1f8b49bd1 update 2016.3.6 release notes with additional PR's 2017-03-15 16:34:17 -06:00
rallytime
72d16c9fa9 Update "yaml" code-block references with "jinja" where needed 
There are many `.. code-block: yaml` definitions that should really
be `.. code-block: jinja` definitions. This commit cleans up some
of those and removes warnings like these from the doc build:

```
WARNING: Could not lex literal_block as "yaml". Highlighting skipped.
```
 2017-03-15 10:22:19 -06:00
rallytime
029f28bbd5 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/cmdmod.py
 2017-03-14 15:44:38 -06:00
Mike Place
60066da614 Merge pull request #39924 from dmurphy18/salt_aix_fixMar 
Add AIX support for user and group execution modules
 2017-03-14 15:04:01 -06:00
Ch3LL
f3e7e4fb2a Add 2016.3.6 Release Notes 2017-03-14 13:39:48 -06:00
rallytime
c8b5d390b5 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/minion.py
 2017-03-09 16:05:15 -07:00
David Murphy
5077c989bb Updated changes file for added AIX support 2017-03-09 09:38:35 -07:00
Ronald van Zantvoort
170cbadc54 CIDR matching supports IPv6, update docs 
After #22080 IPv6 CIDR matching is supported & functional, docs should('ve) reflected that since 2015.8
 2017-03-09 13:52:13 +01:00
Joseph Hall
35440c5936 Add installation tips for azure 2017-03-07 12:12:56 -07:00
Joseph Hall
2a1ae0bf2e Change example master in azure docs 2017-03-07 10:01:09 -07:00
Mike Place
4002dc1947 Merge pull request #39819 from terminalmage/top-file-matching-docs 
Improve the Top File matching docs
 2017-03-04 09:06:39 -07:00
Jan Kadlec
804b12048c Add missing apostrophe 2017-03-03 17:58:53 +01:00
Erik Johnson
7178e77eee Improve the Top File matching docs 
In 2014.7.0, default matcher in the top file was changed to the compound
matcher, but the docs still suggest that it is the glob matcher. This
commit updates the docs to explicitly mention that the compound matcher
is now the default, and adds a table describing all of the available
matchers that can be set in the top file.
 2017-03-03 10:40:22 -06:00
Ch3LL
1853c998c4 add initial 2016.11.4 release notes 2017-03-01 09:47:07 -07:00
Denys Havrysh
1d86cf1161 DOCS: add 2nd level header for advanced targeting methods 2017-02-28 16:23:53 +02:00
rallytime
13622899d2 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/topics/development/contributing.rst
 2017-02-23 14:37:48 -07:00
Mike Place
652044b18f
A note in the docs about mentionbot 2017-02-22 19:34:02 -07:00
Mike Place
5987c4e30e Merge pull request #39573 from thatch45/ssl_docs 
Added a few more comments to the ssl docs
 2017-02-22 19:17:13 -07:00
Ch3LL
c0f8c35df7 fix reference to set in docs 2017-02-22 16:09:16 -07:00
Ch3LL
663f6f159d add additional PRs to 2016.11.3 release notes 2017-02-22 16:04:05 -07:00
Thomas S Hatch
b230c35eac This should be good to go now 2017-02-22 14:29:24 -07:00
Mike Place
b492f7094c Merge pull request #39528 from thatch45/ssl_docs 
Add better ssl option docs
 2017-02-22 11:29:46 -07:00