Mike Place
82582f0304
Merge pull request #42174 from mcalmer/2017.7-kubernetes-cert-auth
...
kubernetes: provide client certificate authentication
2017-08-06 13:10:24 -05:00
Mike Place
7b2119feee
Merge pull request #42669 from garethgreenaway/42642_2016_11_augeas_module_fix
...
[2016.11] Fixes to augeas module
2017-08-06 12:58:02 -05:00
Mike Place
ea16eb24cd
Merge pull request #42658 from alektant/patch-1
...
Update libvirt.rst
2017-08-06 12:52:30 -05:00
Mike Place
281482ae6f
Merge branch 'develop' into yumpkg-install-performance
2017-08-06 12:50:10 -05:00
Mike Place
791248e398
Merge pull request #42689 from hibbert/boto_efs_fix_tags
...
boto_efs_fix_tags: Fix #42688 invalid type for parameter tags
2017-08-06 12:47:06 -05:00
garethgreenaway
2572ce7aad
Merge branch 'develop' into fixup_42369
2017-08-05 14:59:07 -07:00
Morgan Willcock
318dd5f83b
Call isdigit
2017-08-05 22:26:44 +01:00
Morgan Willcock
4188a93b94
Make disk grain work on Windows
2017-08-05 21:32:55 +01:00
garethgreenaway
1b3407649b
Merge pull request #42745 from terminalmage/issue42705
...
docker.compare_container: treat null oom_kill_disable as False
2017-08-05 08:28:19 -07:00
Aljosha Friemann
9ddccbf8d5
Catch TypeError thrown by m2crypto when parsing missing subjects in certificate files.
2017-08-05 13:36:07 +02:00
Erik Johnson
710bdf6115
docker.compare_container: treat null oom_kill_disable as False
...
Resolves #42705 .
2017-08-04 21:47:07 -05:00
Gareth J. Greenaway
69fca7845d
Adding a state function to create a directory in etcd.
2017-08-04 16:55:35 -07:00
Adam Mendlik
e0b29ed265
Add SDB support to flat roster
2017-08-04 17:47:39 -06:00
Mike Place
5d5b22021b
Merge pull request #42704 from whiteinge/expr_form-warn-scope-bug
...
Add import to work around likely multiprocessing scoping bug
2017-08-04 18:03:13 -05:00
Mike Place
17259dd9b0
Replace tabs with spaces
2017-08-04 16:49:08 -06:00
Jonathan LaBroad
2dfdce69dc
Use extract_perms parameter of archive.extracted and set win32 attributes in archive.unzip
2017-08-04 15:16:14 -04:00
Seth House
de60b77c82
Workaround Orchestrate problem that highstate outputter mutates data
2017-08-04 13:01:50 -06:00
garethgreenaway
7ab66574a0
Merge branch 'develop' into patch-1
2017-08-04 10:26:37 -07:00
garethgreenaway
3e6abee1af
Merge branch 'develop' into consul_fix
2017-08-04 10:04:25 -07:00
garethgreenaway
888e954e73
Merge pull request #42743 from kkoppel/fix-issue-42741
...
Fix docker.compare_container for containers with links
2017-08-04 09:00:33 -07:00
garethgreenaway
de6d3cc0cf
Update dockermod.py
2017-08-04 08:59:33 -07:00
garethgreenaway
03a7f9bbee
Merge pull request #42710 from gtmanfred/syndic
...
use subtraction instead of or
2017-08-04 08:14:13 -07:00
Adam Mendlik
f3dcfca4e0
Fix infinite loops on failed Windows deployments
2017-08-04 09:09:15 -06:00
Michal Glabicki
d77b7ef09c
changed AvailablePackages to subclass salt.utils.lazy.LazyDict
2017-08-04 15:20:49 +02:00
Kristjan Koppel
58b997c67f
Added a helper function that removes container names from container HostConfig:Links values to enable compare_container() to make the correct decision about differences in links.
...
Fixes #42741
2017-08-04 15:35:41 +03:00
Melissa Michels
08b38086ee
Merge branch 'develop' into fix-file.absent-inconsistency
2017-08-04 08:24:16 -04:00
Mike Place
547ada9418
Merge pull request #42612 from nhavens/develop
...
fix for issue #42611
2017-08-03 17:37:05 -05:00
Mike Place
b8acf9f6ec
Merge pull request #42624 from lyft/modernize-boto-sqs-modules
...
Modernize boto_sqs execution and state modules
2017-08-03 17:34:18 -05:00
Mike Place
30725769ed
Merge pull request #42629 from xiaoanyunfei/tornadoapi
...
tornado api
2017-08-03 17:21:19 -05:00
Mike Place
f0f00fcee1
Merge pull request #42655 from whiteinge/rest_cherrypy-reenable-stats
...
Reenable cpstats for rest_cherrypy
2017-08-03 15:44:10 -05:00
Mike Place
58ea6d87c9
Merge branch 'develop' into patch-1
2017-08-03 15:35:53 -05:00
Mike Place
005182b6a1
Merge pull request #42670 from gtmanfred/kube
...
render kubernetes docs
2017-08-03 15:30:55 -05:00
Mike Place
df354ddabf
Merge pull request #42712 from twangboy/win_build_pkg
...
Remove master config file from minion-only installer
2017-08-03 15:25:02 -05:00
Mike Place
21cf15f9c3
Merge pull request #42693 from gilbsgilbs/fix-rabbitmq-tags
...
Fix RabbitMQ tags not properly set.
2017-08-03 15:23:08 -05:00
Melissa Michels
aa61d88982
Set force=true when removing a windows directory
2017-08-03 16:20:01 -04:00
Daniel Wallace
683561a711
use subtraction instead of or
...
If we use or, we will get minions that are in the ret list, but not connected
to the master in cases where the syndic is used.
2017-08-03 09:02:49 -06:00
Daniel Wallace
8784899942
fix syntax
2017-08-03 09:02:09 -06:00
Daniel Wallace
178cc1bd81
make sure names are correct
2017-08-03 09:02:09 -06:00
Daniel Wallace
f179b97b52
add py3 for versionlock
2017-08-03 09:02:09 -06:00
Daniel Wallace
1958d18634
python2- prefix for fedora 26 packages
2017-08-03 09:02:09 -06:00
Daniel Wallace
bca17902f5
add version added info
2017-08-03 09:01:34 -06:00
Daniel Wallace
4bbfc751ae
render kubernetes docs
2017-08-03 09:01:34 -06:00
Mike Place
bb1dfd4a42
Merge pull request #42714 from cachedout/workaround_jnpr_test_bug
...
Set fact gathering style to 'old' for test_junos
2017-08-03 08:39:39 -05:00
Andy Hibbert
f58256802a
allow_no_ip_sg: Allow user to not supply ipaddress or securitygroups when running boto_efs.create_mount_target
...
Change-Id: I558de2e80e71399a442913f33fc69b5d84490361
2017-08-03 12:01:47 +01:00
Mike Place
834d6c605e
Set fact gathering style to 'old' for test_junos
...
Without this, we stacktrace because it does not appear that setting
'gather_facts' to False prevents the library from assuming the presence
of facts. I believe this to be an upstream bug with jnpr.
Because they have listed this as being a deprecated option in the future
this may re-break in the future.
2017-08-02 23:11:52 -06:00
twangboy
8604312a7b
Remove master conf in minion install
2017-08-02 17:12:02 -06:00
C. R. Oldham
a260e913b5
Do not change the arguments of the function when memoizing
2017-08-02 13:44:32 -06:00
Seth House
03b675a618
Add import to work around likely multiprocessing scoping bug
...
Fixes #42649 .
2017-08-02 12:51:59 -06:00
Daniel Wallace
1a0457af51
allow adding extra remotes to a repository
2017-08-02 10:30:29 -06:00
NLR
78fccdc7e2
Cast to list in case tags is a tuple.
2017-08-02 17:57:41 +02:00
