Ch3LL
9c6d8d892f
additional PRs/issues for 2016.3.6 release notes
2017-03-20 15:45:29 -06:00
Nicole Thomas
60e1d4e2f3
Merge pull request #40159 from cro/sign_pub
...
Turn on sign_pub_messages by default.
2017-03-20 15:00:48 -06:00
Nicole Thomas
e663b761fb
Fix small syntax error
2017-03-20 14:06:52 -06:00
C. R. Oldham
0a0f46fb14
Turn on sign_pub_messages by default. Make sure messages with no 'sig' are dropped with error when sign_pub_messages is True.
2017-03-20 11:36:01 -06:00
Erik Johnson
28e4fc17b6
Merge pull request #40123 from twangboy/win_fix_network
...
Adds support for inet_pton in Windows to network util
2017-03-20 11:25:46 -05:00
Mike Place
35ddb79f59
Merge pull request #40141 from bobrik/fallback-resolve
...
Use the first address if cannot connect to any
2017-03-20 09:06:56 -06:00
Ivan Babrou
af1545deed
Use the first address if cannot connect to any
...
This fixes #39995 . The previous work happened in #39289 .
2017-03-18 21:09:16 -07:00
twangboy
06dfd55ef9
Adds support for inet_pton in Windows to network util
2017-03-17 10:16:58 -06:00
Nicole Thomas
116201f345
Merge pull request #40059 from terminalmage/fix-virtualenv-traceback
...
Fix traceback when virtualenv.managed is invoked with nonexistant user
2017-03-16 14:46:42 -06:00
Nicole Thomas
a01b52b9a3
Merge pull request #40090 from rallytime/bp-40056
...
Back-port #40056 to 2016.3
2017-03-16 13:42:57 -06:00
Thomas S Hatch
ae012db87a
update mention bot blacklist
2017-03-16 12:15:07 -06:00
Nicole Thomas
d1570bba4c
Merge pull request #40057 from cachedout/ollie_blacklist
...
More mentionbot blacklists
2017-03-16 12:10:10 -06:00
Nicole Thomas
0ac2e83d37
Merge branch '2016.3' into ollie_blacklist
2017-03-16 11:01:10 -06:00
Nicole Thomas
d36bdb1a6e
Merge pull request #40070 from Ch3LL/2016.3.6_release
...
update 2016.3.6 release notes with additional PR's
2017-03-16 09:43:21 -06:00
Ch3LL
a1f8b49bd1
update 2016.3.6 release notes with additional PR's
2017-03-15 16:34:17 -06:00
Erik Johnson
e3cfd29d6b
Fix traceback when virtualenv.managed is invoked with nonexistant user
2017-03-15 16:26:26 -05:00
Mike Place
8dcffc7751
Merge pull request #40018 from meaksh/2016.3-handling-timeouts-for-manage.up-runner
...
Allows overriding 'timeout' and 'gather_job_timeout' to 'manage.up' runner call
2017-03-15 13:43:00 -06:00
Mike Place
5592c680b5
More mentionbot blacklists
2017-03-15 13:33:58 -06:00
Mike Place
22fc5299a2
Merge pull request #40038 from velom/fix-pip-freeze-parsing
...
correctly parse "pkg_name===version" from pip freeze
2017-03-15 13:30:02 -06:00
Mike Place
3584f935fa
Merge pull request #40053 from saltstack/rh_ip_patch
...
Update rh_ip.py
2017-03-15 12:57:31 -06:00
Nicole Thomas
837432d3d2
Merge pull request #40041 from terminalmage/issue40011
...
Fix transposed lines in salt.utils.process
2017-03-15 11:58:24 -06:00
Daniel Wallace
219947acdb
Update rh_ip.py
2017-03-15 12:07:27 -05:00
velom
3fae91d879
correctly parse "pkg_name===version" from pip freeze
2017-03-15 18:00:38 +03:00
Erik Johnson
5b5d1b375c
Fix transposed lines in salt.utils.process
...
Resolves #40011 .
2017-03-15 09:31:30 -05:00
Mike Place
ee7f3b1200
Merge pull request #40021 from Ch3LL/2016.3.6_release
...
2016.3.6 release notes with change log
2017-03-14 15:06:18 -06:00
Ch3LL
f3e7e4fb2a
Add 2016.3.6 Release Notes
2017-03-14 13:39:48 -06:00
Nicole Thomas
26895b7be2
Merge pull request #40016 from terminalmage/fix-grains-test
...
Attempt to fix failing grains tests in 2016.3
2017-03-14 12:34:31 -06:00
Nicole Thomas
0c61d064ad
Merge pull request #39980 from vutny/cmd-run-state-bg
...
[2016.3] Allow to use `bg` kwarg for `cmd.run` state function
2017-03-14 11:16:13 -06:00
Nicole Thomas
0ec81a4cde
Fixup a syntax error
2017-03-14 11:15:02 -06:00
Pablo Suárez Hernández
9f5c3b7dcd
Allows to set custom timeouts for 'manage.up' and 'manage.status'
2017-03-14 16:40:09 +00:00
Pablo Suárez Hernández
2102d9c75c
Allows to set 'timeout' and 'gather_job_timeout' via kwargs
2017-03-14 16:39:28 +00:00
Erik Johnson
5d84b40bfd
Attempt to fix failing grains tests in 2016.3
...
The tearDown appears to only be removing the grain if it matches a
specific value. This may be leading to the grain value not being blank
at the time the next test is run.
Instead of only deleting the grain if it matches a specific value,
instead delete all items from that grain to ensure that it is empty for
the next test.
2017-03-14 11:25:15 -05:00
Erik Johnson
b042484455
Merge pull request #39994 from rallytime/ulimits-dockerng-version
...
Add a versionadded tag for dockerng ulimits addition
2017-03-13 15:58:01 -05:00
rallytime
37bd800fac
Add a versionadded tag for dockerng ulimits addition
...
Fixes #39942
2017-03-13 14:20:02 -06:00
Erik Johnson
e125c94ba5
Merge pull request #39988 from terminalmage/dockerng-timeout
...
Add comment explaining change from #39973
2017-03-13 13:37:28 -05:00
Erik Johnson
bd2519ed1b
Add comment explaining change from #39973
...
See https://github.com/saltstack/salt/pull/39973#issuecomment-286142419
2017-03-13 10:51:29 -05:00
Denys Havrysh
a81dc9dfc1
[2016.3] Allow to use bg kwarg for cmd.run state function
2017-03-13 11:59:03 +02:00
Mike Place
cd0336e868
Merge pull request #39973 from terminalmage/dockerng-timeout
...
Don't use docker.Client instance from context if missing attributes
2017-03-11 07:57:49 -07:00
Erik Johnson
869416e7db
Don't use docker.Client instance from context if missing attributes
...
Under some circumstances (which I can't reliably reproduce), the
docker.Client() instance does not have a timeout attribute, causing
anything that needs to use the docker client to result in a traceback.
This fixes this corner case (later branches initialize the timeout
differently).
2017-03-10 21:48:49 -06:00
Mike Place
282c607d26
Merge pull request #39962 from cachedout/disable_mentionbot_delay_3
...
Disable mention bot delay on 2016.3
2017-03-10 13:24:07 -07:00
Mike Place
7a638f204b
Disable mention bot delay on 2016.3
2017-03-10 13:23:20 -07:00
Mike Place
1e0c88ae08
Merge pull request #39937 from cachedout/gpg_zypper
...
Fix --non-gpg-checks in zypper module
2017-03-10 11:02:51 -07:00
Mike Place
13ed0d1209
Fix --non-gpg-checks in zypper module
...
Fix via @jporcaro
2017-03-09 17:18:45 -07:00
Nicole Thomas
4526fc6e08
Merge pull request #39929 from terminalmage/pr-39770-2016.3
...
Scrap event-based approach for refreshing grains (2016.3 branch)
2017-03-09 15:03:15 -07:00
Erik Johnson
cf0100dabe
Scrap event-based approach for refreshing grains
...
The call to refresh_modules() in saltutil.refresh_grains was resulting
in a race condition with the event I added to refresh the grains. This
meant that, even though self.opts['grains'] was being changed by the new
event, before that process could finish the module refresh was itself
re-loading the grains and re-packing these new grains into the
__grains__ dunder, negating the refresh.
Since the module refresh loads the grains anyway, this commit changes
saltutil.refresh_grains to refresh the modules. It also removes the
refresh argument recently added to the grains module functions, as we're
no longer using it to conditionally refresh modules.
2017-03-09 13:24:01 -06:00
Nicole Thomas
111110caf8
Merge pull request #39919 from The-Loeki/patch-1
...
CIDR matching supports IPv6, update docs
2017-03-09 09:02:59 -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
Nicole Thomas
caf10e9988
Merge pull request #39899 from techhat/cleanupdisks
...
Update cleanup function for azure
2017-03-08 16:28:32 -07:00
Joseph Hall
baf4579e63
Update cleanup function for azure
2017-03-08 10:19:06 -07:00
Mike Place
fcf95f3654
Merge pull request #39871 from terminalmage/squelch-import-warning
...
Squelch warning for pygit2 import
2017-03-07 13:40:17 -07:00
