twangboy
984ee934a7
Merge branch 'develop' of https://github.com/saltstack/salt into develop
2017-03-10 21:53:07 +00:00
twangboy
02757db1e4
Add python 3 installer for Windows
2017-03-10 21:52:38 +00:00
rallytime
3022466615
Merge branch '2016.3' into '2016.11'
...
No conflicts.
2017-03-10 14:37:51 -07:00
Joseph Hall
44bb43825a
Update Azure ARM cache
2017-03-10 14:15:12 -07:00
Daniel Wallace
67850916a0
add utils to engines
2017-03-10 15:05:02 -06:00
Mike Place
62a4357d47
Merge pull request #39911 from gtmanfred/subset
...
add subset to orchestrate
2017-03-10 14:03:07 -07:00
Mike Place
c3579e9284
Merge pull request #39912 from dis-xcom/develop
...
Add slaves to bond master interface after it's set up
2017-03-10 14:00:41 -07:00
Mike Place
771ea652e7
Merge pull request #39964 from cachedout/disable_mentionbot_delay_dev
...
Disable mentionbot delay on develop
2017-03-10 13:26:24 -07:00
Mike Place
bc073f98e0
Disable mentionbot delay on develop
2017-03-10 13:25:55 -07:00
Mike Place
269a2fd739
Merge pull request #39963 from cachedout/disable_mentionbot_delay_11
...
Mention bot delay disable for 2016.11
2017-03-10 13:25:24 -07:00
Mike Place
5fcea05691
Mention bot delay disable for 2016.11
2017-03-10 13:24:39 -07: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
935652cb24
Merge pull request #39923 from cloudflare/capirca-module
...
New execution module: Capirca
2017-03-10 12:25:29 -07:00
Mike Place
6350b07384
Merge pull request #39952 from vutny/doc-faq-minion-upgrade-restart
...
Fix #7997 : describe how to upgrade Salt Minion in a proper way
2017-03-10 11:41:56 -07:00
rallytime
1bcebcc3ef
Add a function to list PRs to the GitHub execution module
2017-03-10 11:38:18 -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
dc7d4f4224
Merge pull request #39935 from cro/namespace_proxy_cfg
...
Add special token to insert the minion id into the default_include path
2017-03-10 10:51:54 -07:00
Nicole Thomas
9503a1d0c6
Merge pull request #39936 from rallytime/merge-2016.11
...
[2016.11] Merge forward from 2016.3 to 2016.11
2017-03-10 10:05:04 -07:00
Erik Johnson
d2206d1a94
Changes to imports to comport with test suite changes in develop
2017-03-10 11:05:02 -06:00
Erik Johnson
db5208b65a
Set up special file_roots for windows symlink test
2017-03-10 11:05:02 -06:00
Erik Johnson
22d5689eb0
Clarify reason for skipping test
2017-03-10 11:05:02 -06:00
twangboy
05cca8b72d
Add filerserver test to whitelist, skip symlink test
2017-03-10 11:05:02 -06:00
Erik Johnson
07b47411aa
salt.fileserver.roots: windows path sep fixes
2017-03-10 11:04:09 -06:00
Erik Johnson
914c45ee62
Use salt.utils.path in win_file module
2017-03-10 11:04:09 -06:00
Erik Johnson
7699bb06e0
salt.fileserver.roots: Use salt.utils.path to handle symlinks
2017-03-10 11:04:09 -06:00
Erik Johnson
07cf20d59e
Add salt.utils.path
2017-03-10 11:04:09 -06:00
Mike Place
a357b88fa8
Merge pull request #39938 from bodhi-space/infra4506
...
INFRA-4506 - boto_lambda module is mysteriously missing a 'list_functions' function
2017-03-10 09:21:31 -07:00
Mike Place
bdbff1ed73
Merge pull request #39941 from moio/minionswarm-set-uuid
...
minionswarm.py: allow random UUID
2017-03-10 09:16:57 -07:00
Denys Havrysh
d989d749d6
Fix #7997 : describe how to upgrade Salt Minion in a proper way
2017-03-10 16:17:19 +02:00
Silvio Moioli
83c93d1268
minionswarm.py: allow random UUID
2017-03-10 12:10:21 +01:00
Tom Williams
030913341f
INFRA-4506 - add CLI example before lint complains :)
2017-03-10 02:12:16 -05:00
Tom Williams
7e6fd43f77
INFRA-4506 - boto_lambda module is mysteriously missing a 'list_functions' function
2017-03-10 02:08:31 -05:00
Daniel Wallace
7a7f96a982
add specific docs for cmd_subset
2017-03-09 18:44:57 -06:00
Mike Place
eca9844cca
Merge pull request #39926 from cloudflare/netacl-module
...
New execution module: netacl (napalm_acl)
2017-03-09 17:31:34 -07:00
Mike Place
27f1fffd33
Merge pull request #39927 from cloudflare/netacl-state
...
Netacl state
2017-03-09 17:29:26 -07:00
Mike Place
bbf4eacbba
Merge pull request #39930 from s0undt3ch/features/py3
...
Moar Py3 and a fix for #38121
2017-03-09 17:25:01 -07:00
Mike Place
899e037f0a
Merge pull request #39932 from rallytime/cp-beacon-fixes
...
Cherry-pick the beacon fixes made in #39930 to 2016.11
2017-03-09 17:21:08 -07:00
Mike Place
2e68edee4a
Merge pull request #39933 from hkrist/fix-rawfile_json_returner-format
...
Fixed rawfile_json returner output format.
2017-03-09 17:20:51 -07:00
Mike Place
fb0dc33c42
Merge pull request #39934 from dmurphy18/fix_host_list
...
Correct comment lines output from execution module's host.list_hosts
2017-03-09 17:20:13 -07:00
Mike Place
13ed0d1209
Fix --non-gpg-checks in zypper module
...
Fix via @jporcaro
2017-03-09 17:18:45 -07:00
rallytime
c8b5d390b5
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- salt/minion.py
2017-03-09 16:05:15 -07:00
Sergey Kizunov
ce59f53227
Avahi/Bonjour: Detect hostname or IP address change
...
If the hostname changes and Avahi/Bonjour are configured to use the
hostname, then it should update the mDNS records that are announced
with the new hostname. If an IP address changes and the listener
detects changes by the service record announcement going down and then
back up (when `reset_on_change` is True in the configuration), then
perform the reset so that the listener will know that an IP address
may have potentially changed.
Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2017-03-09 17:04:50 -06:00
C. R. Oldham
e4aef54c73
Add special token to insert the minion id into the default_include path
2017-03-09 15:31:16 -07:00
Nicole Thomas
a6f88d03df
Merge pull request #39900 from twangboy/win_fix_line
...
Namespace the line function properly in win_file
2017-03-09 15:19:11 -07:00
Nicole Thomas
77ecff4e02
Merge pull request #39910 from rallytime/bp-37743
...
Back-port #37743 to 2016.11
2017-03-09 15:16:57 -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
Nicole Thomas
c2d4d17589
Merge pull request #39770 from rallytime/merge-2016.11
...
[2016.11] Merge forward from 2016.3 to 2016.11
2017-03-09 15:00:17 -07:00
Nicole Thomas
8a80d036ea
Merge pull request #39931 from rallytime/lint-develop
...
[develop] Fix pylint error
2017-03-09 14:59:21 -07:00
rallytime
4a52cca926
Pylint fixes
2017-03-09 14:55:33 -07:00
