David A. Pocock
266dc00a23
Typo correction of lover to lower
2017-10-10 15:04:00 -05: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
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
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
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
Nicole Thomas
a2161efda3
Merge pull request #43707 from terminalmage/issue43373
...
Add missing support for use/use_in requisites to state.sls_id
2017-10-01 10:07:52 -04:00
garethgreenaway
85b3aa332a
Merge pull request #43807 from terminalmage/issue43522
...
cmdmod: Don't list-ify string commands on Windows
2017-09-28 19:48:35 -07:00
Erik Johnson
d8708bf698
cmdmod: Don't list-ify string commands on Windows
...
See https://github.com/saltstack/salt/issues/43522 .
2017-09-28 13:10:03 -05:00
Mike Place
ea8d273c2b
Merge pull request #43768 from vutny/fix-pylint-deprecation-warnings
...
Fix Pylint deprecated option warnings
2017-09-28 14:27:35 +02:00
Ch3LL
f72bc00000
[2016.11] Bump latest and previous versions
2017-09-27 12:24:09 -04:00
garethgreenaway
f8b3fa9da1
Merge branch '2016.11' into fix-pylint-deprecation-warnings
2017-09-27 08:40:21 -07:00
garethgreenaway
1a8cc60bb4
Merge pull request #43772 from gtmanfred/2016.11
...
dont print Minion not responding with quiet
2017-09-27 08:39:17 -07:00
garethgreenaway
3ebde1895f
Merge branch '2016.11' into issue43373
2017-09-27 08:27:00 -07:00
Daniel Wallace
0194c60960
dont print Minion not responding with quiet
2017-09-27 08:29:41 -06:00
Denys Havrysh
651ed16ad3
Fix Pylint deprecated option warnings
2017-09-27 10:38:47 +03:00
Erik Johnson
9dee896fb9
Merge pull request #43747 from rallytime/gpg-verification
...
Add GPG Verification section to Contributing Docs
2017-09-26 16:25:37 -05:00
Nicole Thomas
7a70de19f4
Merge branch '2016.11' into gpg-verification
2017-09-26 16:35:29 -04:00
Nicole Thomas
1cc3ad1c8d
Merge pull request #43733 from terminalmage/issue43729
...
Allow docker_events engine to work with newer docker-py
2017-09-26 12:47:39 -04:00
Nicole Thomas
5d38be4ff7
Merge pull request #43458 from terminalmage/issue42082
...
Fix missing PER_REMOTE_ONLY in cache.clear_git_lock runner
2017-09-26 10:39:00 -04:00
rallytime
23bb4a5dde
Add GPG Verification section to Contributing Docs
...
When we enable GPG Verification for pull request reviews, we should
make sure there is information available in our Contributing docs
about how to sign commits.
2017-09-26 10:16:56 -04:00
Nicole Thomas
e580ed4caa
Merge branch '2016.11' into issue43373
2017-09-26 10:10:32 -04:00
Erik Johnson
023a563657
Merge pull request #43727 from rallytime/fix-43650
...
Revise "Contributing" docs: merge-forwards/release branches explained!
2017-09-26 07:43:15 -05:00
Erik Johnson
6e5c99bda0
Allow docker_events engine to work with newer docker-py
...
The Client attribute was renamed to APIClient in docker-py 2.0
2017-09-26 07:18:33 -05:00
Erik Johnson
5b3be6e8af
Fix failing unit test
2017-09-25 16:06:33 -05:00
Erik Johnson
5f90812b12
Fix missing PER_REMOTE_ONLY in cache.clear_git_lock runner
...
This allows for the runner to clear the git lock if any of the
per-remote-only params was present in the configuration.
This also adds PER_REMOTE_ONLY attributes to the winrepo runner and
git_pillar external pillar, and fixes all refs to GitBase's init_remotes
function to include PER_REMOTE_ONLY arguments. This will insulate us
against future headaches if either git_pillar or winrepo gain extra
per-remote-only params, as we will only need to make the change to the
attribute in their respective modules.
2017-09-25 15:17:47 -05:00
rallytime
babad12d83
Revise "Contributing" docs: merge-forwards/release branches explained!
...
Fixes #43650
The merge-forward process needs a more prominent position and explanation
in the contributing documentation. This change attempts to explain this
process a little more fully and incorporates some changes to how we are
handling "main" release branches, "dot" release branches, and "develop"
in a more complete context with merge-forwards.
2017-09-25 15:23:01 -04:00
Erik Johnson
f73764481b
Add missing support for use/use_in requisites to state.sls_id
...
Because requisite resolution doesn't happen until we run call_high, and
state.sls_id doesn't run call_high (but rather calls a single low chunk
from the compiled low chunks), the use/use_in requisites are ignored.
This fixes that oversight by resolving requisites in state.sls_id before
we compile the high data.
2017-09-22 17:03:53 -05:00
Mike Place
f46c858f25
Merge pull request #43648 from rallytime/handle-boto-vpc-errors
...
Handle VPC/Subnet ID not found errors in boto_vpc module
2017-09-22 11:40:42 -06:00
Mike Place
9dba34aa06
Merge pull request #43575 from akissa/fix-csr-not-recreated-if-key-changes
...
Fix CSR not recreated if key changes
2017-09-21 11:52:00 -06:00
Mike Place
1d4fa48209
Merge pull request #43672 from rallytime/bp-43415
...
Back-port #43415 to 2016.11
2017-09-21 10:38:55 -06:00
Mike Place
ff832ee607
Merge pull request #43673 from rallytime/bp-43652
...
Back-port #43652 to 2016.11
2017-09-21 10:37:35 -06:00
Mike Place
365cb9fba8
Merge pull request #43677 from terminalmage/runners-docs-2016.11
...
Fix RST headers for runners (2016.11 branch)
2017-09-21 10:35:56 -06:00
Erik Johnson
2fd88e94fa
Fix RST headers for runners (2016.11 branch)
...
To conform with the rest of the rst files for runner docs, they should
only contain the module name.
2017-09-21 10:11:28 -05:00
