rallytime
9f547a31f0
Merge branch '2016.11' into '2017.7'
2018-01-16 17:19:08 -05:00
Damon Atkins
10a7501ede
Update release notes
2018-01-12 03:11:07 +11:00
rallytime
f65e091df8
Merge branch '2016.11' into '2017.7'
...
No conflicts.
2018-01-10 10:15:19 -05:00
Gareth J. Greenaway
edfc3dc078
Adding in documention for auth_events configuration option
2018-01-05 12:29:21 -08:00
Damon Atkins
325a9f0f66
Update 2016.11.9.rst
2018-01-05 01:51:14 +11:00
Damon Atkins
4da9200b9c
Update 2016.11.9.rst
2018-01-05 01:46:20 +11:00
Damon Atkins
126aee36ac
Update 2016.11.9.rst
2018-01-05 01:38:22 +11:00
Damon Atkins
1c01967943
Update 2016.11.9.rst
2018-01-05 01:36:57 +11:00
sumeetisp
1b4806e2b9
Updating python version
...
As 2017.7 does not support python 2.6 documentation needs to be updated to reflect this dependency
2018-01-04 10:56:56 +05:30
mvivaldi
d23ac4eabc
Fix for the jinja documentation
2017-12-12 17:35:46 +01:00
mvivaldi
62409d608a
Added Escape Filters and Set Theory Filters in jinja documentation
2017-12-09 09:48:55 +01:00
rallytime
239f3511bf
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/modules/reg.py
- salt/modules/state.py
- salt/modules/win_pkg.py
- salt/netapi/rest_cherrypy/app.py
- salt/utils/__init__.py
- tests/integration/modules/test_file.py
- tests/integration/output/test_output.py
- tests/unit/grains/test_core.py
2017-12-01 11:12:44 -05:00
Mircea Ulinic
f8d69dd0ba
Add thorium_roots configuration example
2017-11-30 12:50:29 +00:00
Mircea Ulinic
4610fb4e62
thorium_roots not thorium_roots_dir
2017-11-30 12:48:17 +00:00
Nicole Thomas
04b97bcfad
Merge pull request #44663 from whytewolf/ZD1777_ensure_understanding_of_minion_config_over_grains_file
...
Update notes around grains topic, and salt.modules.grains and salt.state.grains
2017-11-27 16:33:37 -05:00
Thomas Phipps
7fb208b5ad
Update note in topics/grains to reflect that not all grains are ignored.
...
only those set in the minion config
also update header of salt.modules.grains to more closely match what
states says in regard to this.
and tweak the note portion to stand out a bit more.
tweaked the state note to also stand out more
2017-11-22 15:17:45 -08:00
Mircea Ulinic
0320174ea4
Add doc note regarding static grains on proxy minions
2017-11-15 13:19:03 +00:00
Thomas Phipps
d148e39dda
change from md to rst for code reference
2017-11-13 15:15:13 -07:00
Thomas Phipps
955e305bda
fix bad english, as requested by cachedout
2017-11-13 11:49:30 -07:00
Thomas Phipps
7256fcc1c9
update note to take into account grains_cache
2017-11-08 16:36:38 -08:00
Thomas Phipps
aca0405b26
add a note that describes grain rebuilding on restart and refresh
2017-11-07 14:51:32 -08:00
Ch3LL
38ca5520f0
Fix orch doc from pillat.get to pillar.get
2017-11-07 11:36:10 -05:00
David Boucha
c919648ab4
Fix documentation grammar and spelling errors
2017-10-25 17:24:26 -06:00
Tim Freund
9557504b75
Insert missing verb in gitfs walkthrough
2017-10-16 20:27:56 -04:00
Nicole Thomas
2fba45cd3f
Merge pull request #44125 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2017.7.2 to 2017.7
2017-10-16 16:02:24 -04:00
rallytime
c4ae4a6b50
Merge branch '2017.7.2' into '2017.7'
...
Conflicts:
- doc/topics/releases/2017.7.2.rst
2017-10-16 13:53:13 -04:00
Benedikt Werner
1319c822bd
Fixed code snippet in unit testing doc
2017-10-16 17:23:23 +02:00
Nicole Thomas
a85837d72b
Merge pull request #44066 from Ch3LL/cherry_release
...
Add Known CherryPy Issue to 2017.7.2 Release Notes
2017-10-12 11:18:24 -04:00
Ch3LL
8e597fcce9
Add Known CherryPy Issue to 2017.7.2 Release Notes
2017-10-12 09:33:59 -04:00
rallytime
788ad0609a
Merge branch '2016.11' into '2017.7'
...
No conflicts.
2017-10-10 16:34:52 -04:00
Nicole Thomas
d61300df20
Merge pull request #44023 from Ch3LL/11.9rn
...
Add 2016.11.9 Release Note File
2017-10-10 16:03:01 -04:00
Ch3LL
027f509368
Add 2017.7.3 Release Note File
2017-10-10 15:33:42 -04:00
Ch3LL
7f9015eb41
Add 2016.11.9 Release Note File
2017-10-10 15:31:19 -04:00
Benedikt Werner
bc53598027
Fixed spelling mistake in salt_bootstrap tutorial
2017-10-10 19:03:07 +02:00
Benedikt Werner
6c30344824
Added missing tutorial docs to the tutorial index
2017-10-10 19:02:35 +02:00
Mike Place
e434c39c4e
Merge pull request #43960 from cro/ldap_nopw_bind2
...
Require that bindpw be non-empty when auth.ldap.anonymous is False
2017-10-09 17:09:01 -06:00
garethgreenaway
e9dfda2177
Merge pull request #43991 from Ch3LL/3.8_sec_2
...
Add Security Notes to 2016.3.8 Release Notes
2017-10-09 15:00:24 -07:00
Ch3LL
1977df8462
Add Security Notes to 2016.3.8 Release Notes
2017-10-09 16:26:13 -04:00
Ch3LL
57fd6f7bcb
Add Security Notes to 2017.7.2 Release Notes
2017-10-09 13:09:58 -04:00
Ch3LL
f0c3184288
Add Security Notes to 2016.11.8 Release Notes
2017-10-09 13:03:23 -04:00
C. R. Oldham
962a20cf4b
Require that bindpw be non-empty if auth.ldap.anonymous=False
2017-10-06 15:41:07 -06:00
C. R. Oldham
9df3d91d8f
Release notes blurb for change to bindpw requirements
2017-10-06 15:33:10 -06:00
Nicole Thomas
f880ac4c08
Merge pull request #43916 from dereckson/fix-typo-cloud-scaleway
...
Fix typo in salt-cloud scaleway documentation
2017-10-05 14:57:59 -04:00
Sébastien Santoro
15b8b8a9f4
Fix typo in salt-cloud scaleway documentation
...
s/scalewa/scaleway
2017-10-04 23:23:00 +00:00
rallytime
2337904656
Add updated release notes to 2017.7.2 branch
2017-10-02 17:18:30 -04:00
Ch3LL
50779c3b1c
Add note to nitrogen release notes about pip for cent6
2017-09-28 11:50:54 -04:00
rallytime
dfef4a722c
Merge branch '2016.11' into '2017.7'
...
No conflicts.
2017-09-27 11:48:39 -04:00
Nicole Thomas
fb86935d99
Merge pull request #43761 from Ch3LL/release_2017.7.2
...
Release Notes for 2017.7.2
2017-09-27 10:34:51 -04:00
Ch3LL
caf5795856
add mac patch notes
2017-09-26 17:27:29 -04:00
Ch3LL
3d5fce0955
Add 2017.7.2 Release Notes
2017-09-26 17:21:24 -04:00
