Daniel Wallace
a7d3d668f4
missed removing changes in the next test
2017-10-20 08:11:44 -06:00
Daniel Wallace
ac0b5ec440
fix test
2017-10-19 09:28:59 -06:00
Daniel Wallace
d3d00c3e62
add changes to test return
2017-10-18 11:25:44 -06:00
Nicole Thomas
d89c317d96
Merge pull request #44021 from whiteinge/cpstats-attribute-error
...
Also catch cpstats AttributeError for bad CherryPy release ~5.6.0
2017-10-12 14:11:40 -04:00
Seth House
bf14e5f578
Also catch cpstats AttributeError for bad CherryPy release ~5.6.0
2017-10-12 09:50:22 -06:00
Nicole Thomas
bbdabe242a
Merge pull request #44025 from dayid/lover_typo
...
Typo correction of lover to lower
2017-10-11 13:31:44 -04:00
Nicole Thomas
d8f3891a5e
Merge pull request #44030 from rallytime/merge-2016.11
...
[2016.11] Merge forward from 2016.3 to 2016.11
2017-10-11 09:01:41 -04:00
rallytime
53eaf0d75c
Merge branch '2016.3' into '2016.11'
...
No conflicts.
2017-10-10 16:20:33 -04:00
David A. Pocock
385980c21a
Merge branch '2016.11' of https://github.com/saltstack/salt into lover_typo
2017-10-10 15:06:18 -05:00
Nicole Thomas
64fd839377
Merge pull request #44010 from Ch3LL/2016.3.7_follow_up
...
Security Fixes for 2016.3.8
2017-10-10 16:05:00 -04:00
Nicole Thomas
0dbf41e79e
Merge pull request #44011 from Ch3LL/2016.11.7_follow_up
...
Security Fixes for 2016.11.8
2017-10-10 16:04:35 -04:00
David A. Pocock
266dc00a23
Typo correction of lover to lower
2017-10-10 15:04:00 -05: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
Nicole Thomas
9ff53bf63a
Merge pull request #44019 from benediktwerner/2016.11
...
Added missing docs to the tutorial index and fixed spelling mistake
2017-10-10 15:57:05 -04:00
Ch3LL
7f9015eb41
Add 2016.11.9 Release Note File
2017-10-10 15:31:19 -04:00
Nicole Thomas
364523f5f8
Merge pull request #43955 from meaksh/2016.11-fix-2291
...
Enable a new '--with-salt-version' parameter for the "setup.py" script
2017-10-10 13:36:51 -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
Nicole Thomas
fec714b91d
Merge pull request #43962 from bobrik/kmod-built-in
...
Report built-in modiles in kmod.available, fixes #43945
2017-10-10 12:31:39 -04:00
Erik Johnson
c0149101c0
Do not allow IDs with null bytes in decoded payloads
2017-10-10 10:58:42 -04:00
Erik Johnson
19481423dd
Don't allow path separators in minion ID
2017-10-10 10:58:42 -04:00
Ch3LL
9a00302cd8
fix 2016.3.7 release notes merge conflict
2017-10-10 10:55:18 -04:00
Erik Johnson
63da1214db
Do not allow IDs with null bytes in decoded payloads
2017-10-10 10:54:13 -04:00
Erik Johnson
ee792581fc
Don't allow path separators in minion ID
2017-10-10 10:54:13 -04:00
Ch3LL
8aab65c718
fix 2016.3.7 release notes merge conflict
2017-10-10 10:53:38 -04:00
Mike Place
a81b78381b
Merge branch '2016.11' into 2016.11-fix-2291
2017-10-09 17:10:16 -06: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
Ivan Babrou
95ab901553
Report built-in modiles in kmod.available, fixes #43945
2017-10-09 15:44:02 -07: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
Mike Place
2346d2691e
Merge pull request #43968 from rossengeorgiev/fix-zenoss-prod_state
...
fix zenoss state module not respecting test=true
2017-10-09 15:27:29 -06:00
Ch3LL
1977df8462
Add Security Notes to 2016.3.8 Release Notes
2017-10-09 16:26:13 -04:00
Rossen Georgiev
e6d31c1ea6
fix zenoss state module not respecting test=true
2017-10-09 18:53:22 +01:00
garethgreenaway
8d56a5ac45
Merge pull request #43776 from Ch3LL/2016.11.8_docs
...
[2016.11] Bump latest and previous versions
2017-10-09 10:22:14 -07:00
garethgreenaway
21bf71c3f5
Merge pull request #43976 from Ch3LL/11.8_sec
...
Add Security Notes to 2016.11.8 Release Notes
2017-10-09 10:20:53 -07:00
garethgreenaway
bd73dcb02c
Merge pull request #43977 from Ch3LL/3.8_sec
...
Add Security Notes to 2016.3.8 Release Notes
2017-10-09 10:20:30 -07:00
Ch3LL
f0c3184288
Add Security Notes to 2016.11.8 Release Notes
2017-10-09 13:03:23 -04:00
Mike Place
1d5397ab5b
Merge pull request #43973 from terminalmage/fix-grains.has_value
...
Fix grains.has_value when value is False
2017-10-09 08:59:19 -06:00
Erik Johnson
bf45ae6e6a
Fix grains.has_value when value is False
...
This function returns a boolean based on the boolean result of the value
returned when looking up the key. However, this means that if a key
exists and has a value of 0, an empty string, or False/None,
grains.has_value will incorrectly return False. This fixes that by only
returning False when the key is not present.
2017-10-09 08:21:12 -05: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
Pablo Suárez Hernández
44bc91bb98
Enable '--with-salt-version' parameter for setup.py script
2017-10-06 17:12:15 +01:00
Nicole Thomas
9ac3f2ea7b
Merge pull request #43888 from rallytime/bp-43841
...
Back-port #43841 to 2016.11
2017-10-05 16:09:57 -04: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
Nicole Thomas
2ab7549d48
Merge pull request #43884 from UtahDave/2016.11local
...
Update SaltConf banner per Rhett's request
2017-10-04 09:08:29 -04:00
garethgreenaway
e3b2857285
Merge branch '2016.11' into 2016.11local
2017-10-03 11:50:29 -07:00
apapp
87d676f08a
add -n with netstat so we don't resolve
2017-10-03 13:32:30 -04:00
Nicole Thomas
4b882d4272
Merge pull request #43869 from terminalmage/issue43522
...
Only join cmd if it's not a string
2017-10-03 12:25:07 -04:00
David Boucha
8c671fd0c1
Update SaltConf banner per Rhett's request
2017-10-03 10:07:28 -06:00
Erik Johnson
fe28b0d4fb
Only join cmd if it's not a string
...
See https://github.com/saltstack/salt/pull/43807#discussion_r142009644
2017-10-02 14:42:40 -05:00
